Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index c2624b2655ac49e912a8bf1e3de6147672b9c920..1bd69aa9e22acd2905a28e0e5c76d27d0bd00c94 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -21,6 +21,9 @@ config MTD_PHYSMAP
          particular board as well as the bus width, either statically
          with config options or at run-time.
 
+         To compile this driver as a module, choose M here: the
+         module will be called physmap.
+
 config MTD_PHYSMAP_START
        hex "Physical start address of flash mapping"
        depends on MTD_PHYSMAP
@@ -54,7 +57,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 +76,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
 
@@ -110,13 +113,6 @@ config MTD_SUN_UFLASH
          Sun Microsystems boardsets.  This driver will require CFI support
          in the kernel, so if you did not enable CFI previously, do that now.
 
-config MTD_PNC2000
-       tristate "CFI Flash device mapped on Photron PNC-2000"
-       depends on X86 && MTD_CFI && MTD_PARTITIONS
-       help
-         PNC-2000 is the name of Network Camera product from PHOTRON
-         Ltd. in Japan. It uses CFI-compliant flash.
-
 config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"
        depends on X86 && MTD_CFI && MTD_CONCAT
@@ -354,7 +350,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
@@ -576,7 +572,7 @@ config MTD_BAST_MAXSIZE
        default "4"
 
 config MTD_SHARP_SL
-       bool "ROM mapped on Sharp SL Series"
+       tristate "ROM mapped on Sharp SL Series"
        depends on ARCH_PXA
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.