ath9k: Re-order functions in main.c

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

diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 6d8f30deb8689e14a5a7d385bc45abc888b8777e..479d32b57a1eb54b20b731855274bd9d343a62ae 100644 (file)
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -1,12 +1,10 @@
 # drivers/mtd/chips/Kconfig
-# $Id: Kconfig,v 1.18 2005/11/07 11:14:22 gleixner Exp $
 
 menu "RAM/ROM/Flash chip drivers"
        depends on MTD!=n
 
 config MTD_CFI
        tristate "Detect flash chips by Common Flash Interface (CFI) probe"
-       depends on MTD
        select MTD_GEN_PROBE
        help
          The Common Flash Interface specification was developed by Intel,
@@ -18,7 +16,6 @@ config MTD_CFI
 
 config MTD_JEDECPROBE
        tristate "Detect non-CFI AMD/JEDEC-compatible flash chips"
-       depends on MTD
        select MTD_GEN_PROBE
        help
          This option enables JEDEC-style probing of flash chips which are not
@@ -213,21 +210,18 @@ config MTD_CFI_UTIL
 
 config MTD_RAM
        tristate "Support for RAM chips in bus mapping"
-       depends on MTD
        help
          This option enables basic support for RAM chips accessed through
          a bus mapping driver.
 
 config MTD_ROM
        tristate "Support for ROM chips in bus mapping"
-       depends on MTD
        help
          This option enables basic support for ROM chips accessed through
          a bus mapping driver.
 
 config MTD_ABSENT
        tristate "Support for absent chips in bus mapping"
-       depends on MTD
        help
          This option enables support for a dummy probing driver used to
          allocated placeholder MTD devices on systems that have socketed
@@ -236,46 +230,6 @@ config MTD_ABSENT
          the system regardless of media presence.  Device nodes created
          with this driver will return -ENODEV upon access.
 
-config MTD_OBSOLETE_CHIPS
-       depends on MTD
-       bool "Older (theoretically obsoleted now) drivers for non-CFI chips"
-       help
-         This option does not enable any code directly, but will allow you to
-         select some other chip drivers which are now considered obsolete,
-         because the generic CONFIG_JEDECPROBE code above should now detect
-         the chips which are supported by these drivers, and allow the generic
-         CFI-compatible drivers to drive the chips. Say 'N' here unless you have
-         already tried the CONFIG_JEDECPROBE method and reported its failure
-         to the MTD mailing list at <linux-mtd@lists.infradead.org>
-
-config MTD_AMDSTD
-       tristate "AMD compatible flash chip support (non-CFI)"
-       depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
-       help
-         This option enables support for flash chips using AMD-compatible
-         commands, including some which are not CFI-compatible and hence
-         cannot be used with the CONFIG_MTD_CFI_AMDSTD option.
-
-         It also works on AMD compatible chips that do conform to CFI.
-
-config MTD_SHARP
-       tristate "pre-CFI Sharp chip support"
-       depends on MTD && MTD_OBSOLETE_CHIPS
-       help
-         This option enables support for flash chips using Sharp-compatible
-         commands, including some which are not CFI-compatible and hence
-         cannot be used with the CONFIG_MTD_CFI_INTELxxx options.
-
-config MTD_JEDEC
-       tristate "JEDEC device support"
-       depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
-       help
-         Enable older older JEDEC flash interface devices for self
-         programming flash.  It is commonly used in older AMD chips.  It is
-         only called JEDEC because the JEDEC association
-         <http://www.jedec.org/> distributes the identification codes for the
-         chips.
-
 config MTD_XIP
        bool "XIP aware MTD support"
        depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP