Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[karo-tx-linux.git] / arch / arm / mach-omap1 / board-sx1.c

diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index d41fe2d0616adeef602d08e785f4681e5963bb52..0ad781db4e66d0bb0a2581323e6ec761ca0b6db8 100644 (file)
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -399,7 +399,7 @@ static void __init omap_sx1_init(void)
        sx1_mmc_init();
 
        /* turn on USB power */
-       /* sx1_setusbpower(1); cant do it here because i2c is not ready */
+       /* sx1_setusbpower(1); can't do it here because i2c is not ready */
        gpio_request(1, "A_IRDA_OFF");
        gpio_request(11, "A_SWITCH");
        gpio_request(15, "A_USB_ON");