Merge git://git.infradead.org/mtd-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 87158797a66fcc66671e4fe8be642e921425fe02..b665e4ac2208458bc70d1f8dfe9cd00a3a6a58fd 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -6,7 +6,6 @@ menu "Mapping drivers for chip access"
 
 config MTD_COMPLEX_MAPPINGS
        bool "Support non-linear mappings of flash chips"
-       depends on MTD
        help
          This causes the chip drivers to allow for complicated
          paged mappings of flash chips.
@@ -61,7 +60,7 @@ config MTD_PHYSMAP_BANKWIDTH
          (i.e., run-time calling physmap_configure()).
 
 config MTD_PHYSMAP_OF
-       tristate "Flash device in physical memory map based on OF descirption"
+       tristate "Flash device in physical memory map based on OF description"
        depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
        help
          This provides a 'mapping' driver which allows the NOR Flash and
@@ -359,22 +358,6 @@ config MTD_CFI_FLAGADM
          Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
 
-config MTD_BEECH
-       tristate "CFI Flash device mapped on IBM 405LP Beech"
-       depends on MTD_CFI && BEECH
-       help
-         This enables access routines for the flash chips on the IBM
-         405LP Beech board. If you have one of these boards and would like
-         to use the flash chips on it, say 'Y'.
-
-config MTD_ARCTIC
-       tristate "CFI Flash device mapped on IBM 405LP Arctic"
-       depends on MTD_CFI && ARCTIC2
-       help
-         This enables access routines for the flash chips on the IBM 405LP
-         Arctic board. If you have one of these boards and would like to
-         use the flash chips on it, say 'Y'.
-
 config MTD_WALNUT
        tristate "Flash device mapped on IBM 405GP Walnut"
        depends on MTD_JEDECPROBE && WALNUT
@@ -550,7 +533,7 @@ config MTD_OMAP_NOR
 # This needs CFI or JEDEC, depending on the cards found.
 config MTD_PCI
        tristate "PCI MTD driver"
-       depends on MTD && PCI && MTD_COMPLEX_MAPPINGS
+       depends on PCI && MTD_COMPLEX_MAPPINGS
        help
          Mapping for accessing flash devices on add-in cards like the Intel XScale
          IQ80310 card, and the Intel EBSA285 card in blank ROM programming mode
@@ -560,7 +543,7 @@ config MTD_PCI
 
 config MTD_PCMCIA
        tristate "PCMCIA MTD driver"
-       depends on MTD && PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN
+       depends on PCMCIA && MTD_COMPLEX_MAPPINGS && BROKEN
        help
          Map driver for accessing PCMCIA linear flash memory cards. These
          cards are usually around 4-16MiB in size. This does not include
@@ -624,13 +607,12 @@ config MTD_BAST_MAXSIZE
 
 config MTD_SHARP_SL
        bool "ROM mapped on Sharp SL Series"
-       depends on MTD && ARCH_PXA
+       depends on ARCH_PXA
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.
 
 config MTD_PLATRAM
        tristate "Map driver for platform device RAM (mtd-ram)"
-       depends on MTD
        select MTD_RAM
        help
          Map driver for RAM areas described via the platform device