Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / pcmcia / m8xx_pcmcia.c

diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 99d4f23cb4353136dc73a7d0b7d6309f6f71f97e..0db482771fb5d928833dfbcc56700e3fb4daf0f4 100644 (file)
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1198,7 +1198,7 @@ static int __init m8xx_probe(struct platform_device *ofdev,
        out_be32(M8XX_PGCRX(1),
                 M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16));
 
-       /* intialize the fixed memory windows */
+       /* initialize the fixed memory windows */
 
        for (i = 0; i < PCMCIA_SOCKETS_NO; i++) {
                for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) {