Commit:     790864dcc2b3fe65355dd84ef8481e54b1bc61b6
Parent:     055b8224140e7a7515bf8113ce675d58abffedf1
Author:     Jan Engelhardt <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 22:30:32 2007 +0200
Committer:  Pierre Ossman <[EMAIL PROTECTED]>
CommitDate: Tue May 8 22:41:55 2007 +0200

    mmc: Use menuconfig objects
    Change Kconfig objects from "menu, config" into "menuconfig" so
    that the user can disable the whole feature without having to
    enter the menu first.
    Signed-off-by: Jan Engelhardt <[EMAIL PROTECTED]>
    Signed-off-by: Pierre Ossman <[EMAIL PROTECTED]>
 drivers/mmc/Kconfig      |   10 +++++-----
 drivers/mmc/card/Kconfig |    3 +--
 drivers/mmc/core/Kconfig |    1 -
 drivers/mmc/host/Kconfig |   19 +++++++++----------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 6c97491..45b7d53 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -2,10 +2,8 @@
 # MMC subsystem configuration
-menu "MMC/SD Card support"
-config MMC
-       tristate "MMC support"
+menuconfig MMC
+       tristate "MMC/SD card support"
          MMC is the "multi-media card" bus protocol.
@@ -19,10 +17,12 @@ config MMC_DEBUG
          This is an option for use by developers; most people should
          say N here.  This enables MMC core and driver debugging.
+if MMC
 source "drivers/mmc/core/Kconfig"
 source "drivers/mmc/card/Kconfig"
 source "drivers/mmc/host/Kconfig"
+endif # MMC
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
index 01a9fd3..9320a8c 100644
--- a/drivers/mmc/card/Kconfig
+++ b/drivers/mmc/card/Kconfig
@@ -3,11 +3,10 @@
 comment "MMC/SD Card Drivers"
-       depends MMC
 config MMC_BLOCK
        tristate "MMC block device driver"
-       depends on MMC && BLOCK
+       depends on BLOCK
        default y
          Say Y here to enable the MMC block device driver support.
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
index 94222b9..ab37a6d 100644
--- a/drivers/mmc/core/Kconfig
+++ b/drivers/mmc/core/Kconfig
@@ -4,7 +4,6 @@
        bool "Allow unsafe resume (DANGEROUS)"
-       depends on MMC != n
          If you say Y here, the MMC layer will assume that all cards
          stayed in their respective slots during the suspend. The
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index ed4deab..e23082f 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -3,11 +3,10 @@
 comment "MMC/SD Host Controller Drivers"
-       depends on MMC
        tristate "ARM AMBA Multimedia Card Interface support"
-       depends on ARM_AMBA && MMC
+       depends on ARM_AMBA
          This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
          Interface (PL180 and PL181) support.  If you have an ARM(R)
@@ -17,7 +16,7 @@ config MMC_ARMMMCI
 config MMC_PXA
        tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
-       depends on ARCH_PXA && MMC
+       depends on ARCH_PXA
          This selects the Intel(R) PXA(R) Multimedia card Interface.
          If you have a PXA(R) platform with a Multimedia Card slot,
@@ -27,7 +26,7 @@ config MMC_PXA
 config MMC_SDHCI
        tristate "Secure Digital Host Controller Interface support  
-       depends on PCI && MMC && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL
          This select the generic Secure Digital Host Controller Interface.
          It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
@@ -38,7 +37,7 @@ config MMC_SDHCI
 config MMC_OMAP
        tristate "TI OMAP Multimedia Card Interface support"
-       depends on ARCH_OMAP && MMC
+       depends on ARCH_OMAP
        select TPS65010 if MACH_OMAP_H2
          This selects the TI OMAP Multimedia card Interface.
@@ -49,7 +48,7 @@ config MMC_OMAP
 config MMC_WBSD
        tristate "Winbond W83L51xD SD/MMC Card Interface support"
-       depends on MMC && ISA_DMA_API
+       depends on ISA_DMA_API
          This selects the Winbond(R) W83L51xD Secure digital and
           Multimedia card Interface.
@@ -60,7 +59,7 @@ config MMC_WBSD
 config MMC_AU1X
        tristate "Alchemy AU1XX0 MMC Card Interface support"
-       depends on MMC && SOC_AU1200
+       depends on SOC_AU1200
          This selects the AMD Alchemy(R) Multimedia card interface.
          If you have a Alchemy platform with a MMC slot, say Y or M here.
@@ -69,7 +68,7 @@ config MMC_AU1X
 config MMC_AT91
        tristate "AT91 SD/MMC Card Interface support"
-       depends on ARCH_AT91 && MMC
+       depends on ARCH_AT91
          This selects the AT91 MCI controller.
@@ -77,7 +76,7 @@ config MMC_AT91
 config MMC_IMX
        tristate "Motorola i.MX Multimedia Card Interface support"
-       depends on ARCH_IMX && MMC
+       depends on ARCH_IMX
          This selects the Motorola i.MX Multimedia card Interface.
          If you have a i.MX platform with a Multimedia Card slot,
@@ -87,7 +86,7 @@ config MMC_IMX
 config MMC_TIFM_SD
        tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
-       depends on MMC && EXPERIMENTAL && PCI
+       depends on EXPERIMENTAL && PCI
        select TIFM_CORE
          Say Y here if you want to be able to access MMC/SD cards with
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to