Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jan Engelhardt and committed by
Pierre Ossman
790864dc 055b8224

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