Merge branch 'next' into for-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / board-igep0030.c

diff --git a/arch/arm/mach-omap2/board-igep0030.c b/arch/arm/mach-omap2/board-igep0030.c
index b10db0e6ee62d897bce811b0279e1985a74cc901..2cf86c3cb1a3f4124974324bcfa59b33d875bb23 100644 (file)
--- a/arch/arm/mach-omap2/board-igep0030.c
+++ b/arch/arm/mach-omap2/board-igep0030.c
@@ -440,7 +440,7 @@ static void __init igep3_init(void)
        igep3_leds_init();
 
        /*
-        * WLAN-BT combo module from MuRata wich has a Marvell WLAN
+        * WLAN-BT combo module from MuRata which has a Marvell WLAN
         * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface.
         */
        igep3_wifi_bt_init();