diff options
author | Jan Engelhardt <jengelh@gmx.de> | 2007-05-08 16:30:32 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-08 16:41:55 -0400 |
commit | 790864dcc2b3fe65355dd84ef8481e54b1bc61b6 (patch) | |
tree | 0b544fde6b0ecab144df3ecb9b584bbb6522465c | |
parent | 055b8224140e7a7515bf8113ce675d58abffedf1 (diff) |
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 <jengelh@gmx.de>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r-- | drivers/mmc/Kconfig | 10 | ||||
-rw-r--r-- | drivers/mmc/card/Kconfig | 3 | ||||
-rw-r--r-- | drivers/mmc/core/Kconfig | 1 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 19 |
4 files changed, 15 insertions, 18 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 6c97491543db..45b7d53b949c 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig | |||
@@ -2,10 +2,8 @@ | |||
2 | # MMC subsystem configuration | 2 | # MMC subsystem configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | menu "MMC/SD Card support" | 5 | menuconfig MMC |
6 | 6 | tristate "MMC/SD card support" | |
7 | config MMC | ||
8 | tristate "MMC support" | ||
9 | help | 7 | help |
10 | MMC is the "multi-media card" bus protocol. | 8 | MMC is the "multi-media card" bus protocol. |
11 | 9 | ||
@@ -19,10 +17,12 @@ config MMC_DEBUG | |||
19 | This is an option for use by developers; most people should | 17 | This is an option for use by developers; most people should |
20 | say N here. This enables MMC core and driver debugging. | 18 | say N here. This enables MMC core and driver debugging. |
21 | 19 | ||
20 | if MMC | ||
21 | |||
22 | source "drivers/mmc/core/Kconfig" | 22 | source "drivers/mmc/core/Kconfig" |
23 | 23 | ||
24 | source "drivers/mmc/card/Kconfig" | 24 | source "drivers/mmc/card/Kconfig" |
25 | 25 | ||
26 | source "drivers/mmc/host/Kconfig" | 26 | source "drivers/mmc/host/Kconfig" |
27 | 27 | ||
28 | endmenu | 28 | endif # MMC |
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig index 01a9fd376a1f..9320a8c73239 100644 --- a/drivers/mmc/card/Kconfig +++ b/drivers/mmc/card/Kconfig | |||
@@ -3,11 +3,10 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | comment "MMC/SD Card Drivers" | 5 | comment "MMC/SD Card Drivers" |
6 | depends MMC | ||
7 | 6 | ||
8 | config MMC_BLOCK | 7 | config MMC_BLOCK |
9 | tristate "MMC block device driver" | 8 | tristate "MMC block device driver" |
10 | depends on MMC && BLOCK | 9 | depends on BLOCK |
11 | default y | 10 | default y |
12 | help | 11 | help |
13 | Say Y here to enable the MMC block device driver support. | 12 | Say Y here to enable the MMC block device driver support. |
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig index 94222b9a15ea..ab37a6d9d32a 100644 --- a/drivers/mmc/core/Kconfig +++ b/drivers/mmc/core/Kconfig | |||
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | config MMC_UNSAFE_RESUME | 5 | config MMC_UNSAFE_RESUME |
6 | bool "Allow unsafe resume (DANGEROUS)" | 6 | bool "Allow unsafe resume (DANGEROUS)" |
7 | depends on MMC != n | ||
8 | help | 7 | help |
9 | If you say Y here, the MMC layer will assume that all cards | 8 | If you say Y here, the MMC layer will assume that all cards |
10 | stayed in their respective slots during the suspend. The | 9 | stayed in their respective slots during the suspend. The |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index ed4deab2203d..e23082fe88d0 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -3,11 +3,10 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | comment "MMC/SD Host Controller Drivers" | 5 | comment "MMC/SD Host Controller Drivers" |
6 | depends on MMC | ||
7 | 6 | ||
8 | config MMC_ARMMMCI | 7 | config MMC_ARMMMCI |
9 | tristate "ARM AMBA Multimedia Card Interface support" | 8 | tristate "ARM AMBA Multimedia Card Interface support" |
10 | depends on ARM_AMBA && MMC | 9 | depends on ARM_AMBA |
11 | help | 10 | help |
12 | This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card | 11 | This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card |
13 | Interface (PL180 and PL181) support. If you have an ARM(R) | 12 | Interface (PL180 and PL181) support. If you have an ARM(R) |
@@ -17,7 +16,7 @@ config MMC_ARMMMCI | |||
17 | 16 | ||
18 | config MMC_PXA | 17 | config MMC_PXA |
19 | tristate "Intel PXA25x/26x/27x Multimedia Card Interface support" | 18 | tristate "Intel PXA25x/26x/27x Multimedia Card Interface support" |
20 | depends on ARCH_PXA && MMC | 19 | depends on ARCH_PXA |
21 | help | 20 | help |
22 | This selects the Intel(R) PXA(R) Multimedia card Interface. | 21 | This selects the Intel(R) PXA(R) Multimedia card Interface. |
23 | If you have a PXA(R) platform with a Multimedia Card slot, | 22 | If you have a PXA(R) platform with a Multimedia Card slot, |
@@ -27,7 +26,7 @@ config MMC_PXA | |||
27 | 26 | ||
28 | config MMC_SDHCI | 27 | config MMC_SDHCI |
29 | tristate "Secure Digital Host Controller Interface support (EXPERIMENTAL)" | 28 | tristate "Secure Digital Host Controller Interface support (EXPERIMENTAL)" |
30 | depends on PCI && MMC && EXPERIMENTAL | 29 | depends on PCI && EXPERIMENTAL |
31 | help | 30 | help |
32 | This select the generic Secure Digital Host Controller Interface. | 31 | This select the generic Secure Digital Host Controller Interface. |
33 | It is used by manufacturers such as Texas Instruments(R), Ricoh(R) | 32 | It is used by manufacturers such as Texas Instruments(R), Ricoh(R) |
@@ -38,7 +37,7 @@ config MMC_SDHCI | |||
38 | 37 | ||
39 | config MMC_OMAP | 38 | config MMC_OMAP |
40 | tristate "TI OMAP Multimedia Card Interface support" | 39 | tristate "TI OMAP Multimedia Card Interface support" |
41 | depends on ARCH_OMAP && MMC | 40 | depends on ARCH_OMAP |
42 | select TPS65010 if MACH_OMAP_H2 | 41 | select TPS65010 if MACH_OMAP_H2 |
43 | help | 42 | help |
44 | This selects the TI OMAP Multimedia card Interface. | 43 | This selects the TI OMAP Multimedia card Interface. |
@@ -49,7 +48,7 @@ config MMC_OMAP | |||
49 | 48 | ||
50 | config MMC_WBSD | 49 | config MMC_WBSD |
51 | tristate "Winbond W83L51xD SD/MMC Card Interface support" | 50 | tristate "Winbond W83L51xD SD/MMC Card Interface support" |
52 | depends on MMC && ISA_DMA_API | 51 | depends on ISA_DMA_API |
53 | help | 52 | help |
54 | This selects the Winbond(R) W83L51xD Secure digital and | 53 | This selects the Winbond(R) W83L51xD Secure digital and |
55 | Multimedia card Interface. | 54 | Multimedia card Interface. |
@@ -60,7 +59,7 @@ config MMC_WBSD | |||
60 | 59 | ||
61 | config MMC_AU1X | 60 | config MMC_AU1X |
62 | tristate "Alchemy AU1XX0 MMC Card Interface support" | 61 | tristate "Alchemy AU1XX0 MMC Card Interface support" |
63 | depends on MMC && SOC_AU1200 | 62 | depends on SOC_AU1200 |
64 | help | 63 | help |
65 | This selects the AMD Alchemy(R) Multimedia card interface. | 64 | This selects the AMD Alchemy(R) Multimedia card interface. |
66 | If you have a Alchemy platform with a MMC slot, say Y or M here. | 65 | If you have a Alchemy platform with a MMC slot, say Y or M here. |
@@ -69,7 +68,7 @@ config MMC_AU1X | |||
69 | 68 | ||
70 | config MMC_AT91 | 69 | config MMC_AT91 |
71 | tristate "AT91 SD/MMC Card Interface support" | 70 | tristate "AT91 SD/MMC Card Interface support" |
72 | depends on ARCH_AT91 && MMC | 71 | depends on ARCH_AT91 |
73 | help | 72 | help |
74 | This selects the AT91 MCI controller. | 73 | This selects the AT91 MCI controller. |
75 | 74 | ||
@@ -77,7 +76,7 @@ config MMC_AT91 | |||
77 | 76 | ||
78 | config MMC_IMX | 77 | config MMC_IMX |
79 | tristate "Motorola i.MX Multimedia Card Interface support" | 78 | tristate "Motorola i.MX Multimedia Card Interface support" |
80 | depends on ARCH_IMX && MMC | 79 | depends on ARCH_IMX |
81 | help | 80 | help |
82 | This selects the Motorola i.MX Multimedia card Interface. | 81 | This selects the Motorola i.MX Multimedia card Interface. |
83 | If you have a i.MX platform with a Multimedia Card slot, | 82 | If you have a i.MX platform with a Multimedia Card slot, |
@@ -87,7 +86,7 @@ config MMC_IMX | |||
87 | 86 | ||
88 | config MMC_TIFM_SD | 87 | config MMC_TIFM_SD |
89 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" | 88 | tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" |
90 | depends on MMC && EXPERIMENTAL && PCI | 89 | depends on EXPERIMENTAL && PCI |
91 | select TIFM_CORE | 90 | select TIFM_CORE |
92 | help | 91 | help |
93 | Say Y here if you want to be able to access MMC/SD cards with | 92 | Say Y here if you want to be able to access MMC/SD cards with |