Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / video / omap / Kconfig

diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index f12193b2ddb2245e142cc2f13e01ed8edb003452..9418047e68426b750467f18f3e34a5a7df7fc75e 100644 (file)
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -43,7 +43,7 @@ config FB_OMAP_LCD_MIPID
          specification. (Supported LCDs: Philips LPH8923, Sharp LS041Y3)
 
 config FB_OMAP_BOOTLOADER_INIT
-       bool "Check bootloader initializaion"
+       bool "Check bootloader initialization"
        depends on FB_OMAP
        help
          Say Y here if you want to enable checking if the bootloader has