Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index b665e4ac2208458bc70d1f8dfe9cd00a3a6a58fd..2a2a125b0c760a795be1f77bb8889aa21c381a15 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -103,7 +103,7 @@ config MTD_PMC_MSP_RAMROOT
 
 config MTD_SUN_UFLASH
        tristate "Sun Microsystems userflash support"
-       depends on SPARC && MTD_CFI
+       depends on SPARC && MTD_CFI && PCI
        help
          This provides a 'mapping' driver which supports the way in
          which user-programmable flash chips are connected on various
@@ -163,20 +163,12 @@ config MTD_SBC_GXX
          More info at
          <http://www.arcomcontrols.com/products/icp/pc104/processors/SBC_GX1.htm>.
 
-config MTD_LUBBOCK
-       tristate "CFI Flash device mapped on Intel Lubbock XScale eval board"
-       depends on ARCH_LUBBOCK && MTD_CFI_INTELEXT && MTD_PARTITIONS
-       help
-         This provides a driver for the on-board flash of the Intel
-         'Lubbock' XScale evaluation board.
-
-config MTD_MAINSTONE
-       tristate "CFI Flash device mapped on Intel Mainstone XScale eval board"
-       depends on MACH_MAINSTONE && MTD_CFI_INTELEXT
+config MTD_PXA2XX
+       tristate "CFI Flash device mapped on Intel XScale PXA2xx based boards"
+       depends on (PXA25x || PXA27x) && MTD_CFI_INTELEXT
        select MTD_PARTITIONS
        help
-         This provides a driver for the on-board flash of the Intel
-         'Mainstone PXA27x evaluation board.
+         This provides a driver for the NOR flash attached to a PXA2xx chip.
 
 config MTD_OCTAGON
        tristate "JEDEC Flash device mapped on Octagon 5066 SBC"
@@ -258,12 +250,6 @@ config MTD_TSUNAMI
        help
          Support for the flash chip on Tsunami TIG bus.
 
-config MTD_LASAT
-       tristate "LASAT flash device"
-       depends on LASAT && MTD_CFI
-       help
-         Support for the flash chips on the Lasat 100 and 200 boards.
-
 config MTD_NETtel
        tristate "CFI flash device on SnapGear/SecureEdge"
        depends on X86 && MTD_PARTITIONS && MTD_JEDECPROBE
@@ -360,7 +346,7 @@ config MTD_CFI_FLAGADM
 
 config MTD_WALNUT
        tristate "Flash device mapped on IBM 405GP Walnut"
-       depends on MTD_JEDECPROBE && WALNUT
+       depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
        help
          This enables access routines for the flash chips on the IBM 405GP
          Walnut board. If you have one of these boards and would like to
@@ -368,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
@@ -376,7 +362,7 @@ config MTD_EBONY
 
 config MTD_OCOTEA
        tristate "Flash devices mapped on IBM 440GX Ocotea"
-       depends on MTD_CFI && OCOTEA
+       depends on MTD_CFI && OCOTEA && !PPC_MERGE
        help
          This enables access routines for the flash chips on the IBM 440GX
          Ocotea board. If you have one of these boards and would like to
@@ -390,22 +376,6 @@ config MTD_REDWOOD
          Redwood board. If you have one of these boards and would like to
          use the flash chips on it, say 'Y'.
 
-config MTD_TQM834x
-       tristate "Flash device mapped on TQ Components TQM834x Boards"
-       depends on MTD_CFI && TQM834x
-       help
-         This enables access routines for the flash chips on the
-         TQ Components TQM834x boards. If you have one of these boards
-         and would like to use the flash chips on it, say 'Y'.
-
-config MTD_OCELOT
-       tristate "Momenco Ocelot boot flash device"
-       depends on MOMENCO_OCELOT
-       help
-         This enables access routines for the boot flash device and for the
-         NVRAM on the Momenco Ocelot board. If you have one of these boards
-         and would like access to either of these, say 'Y'.
-
 config MTD_SOLUTIONENGINE
        tristate "CFI Flash device mapped on Hitachi SolutionEngine"
        depends on SUPERH && MTD_CFI && MTD_REDBOOT_PARTS
@@ -611,6 +581,13 @@ config MTD_SHARP_SL
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.
 
+config MTD_INTEL_VR_NOR
+       tristate "NOR flash on Intel Vermilion Range Expansion Bus CS0"
+       depends on PCI
+       help
+         Map driver for a NOR flash bank located on the Expansion Bus of the
+         Intel Vermilion Range chipset.
+
 config MTD_PLATRAM
        tristate "Map driver for platform device RAM (mtd-ram)"
        select MTD_RAM