cxgb3: Remove incorrect __devinit annotations

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

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index c2624b2655ac49e912a8bf1e3de6147672b9c920..a592fc04cf781455459bbb390227da7f72fdab50 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -54,7 +54,7 @@ config MTD_PHYSMAP_BANKWIDTH
        help
          This is the total width of the data bus of the flash devices
          in octets. For example, if you have a data bus width of 32
-         bits, you would set the bus width octect value to 4. This is
+         bits, you would set the bus width octet value to 4. This is
          used internally by the CFI drivers.
          Ignore this option if you use run-time physmap configuration
          (i.e., run-time calling physmap_configure()).
@@ -73,12 +73,12 @@ config MTD_PMC_MSP_EVM
        depends on PMC_MSP && MTD_CFI
        select MTD_PARTITIONS
        help
-         This provides a 'mapping' driver which support the way
-          in which user-programmable flash chips are connected on the
-          PMC-Sierra MSP eval/demo boards
+         This provides a 'mapping' driver which supports the way
+         in which user-programmable flash chips are connected on the
+         PMC-Sierra MSP eval/demo boards.
 
 choice
-       prompt "Maximum mappable memory avialable for flash IO"
+       prompt "Maximum mappable memory available for flash IO"
        depends on MTD_PMC_MSP_EVM
        default MSP_FLASH_MAP_LIMIT_32M
 
@@ -354,7 +354,7 @@ config MTD_WALNUT
 
 config MTD_EBONY
        tristate "Flash devices mapped on IBM 440GP Ebony"
-       depends on MTD_JEDECPROBE && EBONY
+       depends on MTD_JEDECPROBE && EBONY && !PPC_MERGE
        help
          This enables access routines for the flash chips on the IBM 440GP
          Ebony board. If you have one of these boards and would like to