Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[can-eth-gw-linux.git] / arch / powerpc / platforms / powermac / pic.c

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index c4e630576ff283666f74c37ee985cf4f1b22b105..31036b56670e6dc18e21a976e7632ccc57d78d4e 100644 (file)
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -529,7 +529,7 @@ static int __init pmac_pic_probe_mpic(void)
 void __init pmac_pic_init(void)
 {
        /* We configure the OF parsing based on our oldworld vs. newworld
-        * platform type and wether we were booted by BootX.
+        * platform type and whether we were booted by BootX.
         */
 #ifdef CONFIG_PPC32
        if (!pmac_newworld)