mfd: remove CONFIG_MFD_SUPPORT

We currently have two symbols to control compilation the MFD subsystem,
MFD_SUPPORT and MFD_CORE. The MFD_SUPPORT is actually not required
at all, it only hides the submenu when not set, with the effect that
Kconfig warns about missing dependencies when another driver selects
an MFD driver while MFD_SUPPORT is disabled. Turning the MFD submenu
back from menuconfig into a plain menu simplifies the Kconfig syntax
for those kinds of users and avoids the surprise when the menu
suddenly appears because another driver was enabled that selects this
symbol.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 57b66d590c522994f923bb01329453d9d14a7330..1aee224c9e4752155f292acdc35199990d9db1d6 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -14,7 +14,6 @@ config ARCH_OMAP2PLUS_TYPICAL
        select SERIAL_OMAP_CONSOLE
        select I2C
        select I2C_OMAP
-       select MFD_SUPPORT
        select MENELAUS if ARCH_OMAP2
        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d539efd96d4b8d5b7c032c5c0767543da7413cd7..fbc5fd449a047d51f9cb1df3fa9be5fe01048e66 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -180,7 +180,7 @@ config GPIO_SCH
 
 config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"
-       depends on MFD_SUPPORT && PCI
+       depends on PCI
        select MFD_CORE
        select MFD_VX855
        help
@@ -417,7 +417,6 @@ config GPIO_TIMBERDALE
 config GPIO_RDC321X
        tristate "RDC R-321x GPIO support"
        depends on PCI
-       select MFD_SUPPORT
        select MFD_CORE
        select MFD_RDC321X
        help

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 646068e5100bac8c6e3e9840bd0ac53596e4728a..d625a484fa853915483e4ca053df443a860cdfa0 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -110,7 +110,6 @@ config I2C_I801
 config I2C_ISCH
        tristate "Intel SCH SMBus 1.0"
        depends on PCI
-       select MFD_CORE
        select LPC_SCH
        help
          Say Y here if you want to use SMBus controller on the Intel SCH

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 52798a111e16cb5a55df761aa228e60ec3f9343f..ccd5f0d8a012113a08b788b9927860079289fa0c 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -426,7 +426,6 @@ config RADIO_TIMBERDALE
 config RADIO_WL1273
        tristate "Texas Instruments WL1273 I2C FM Radio"
        depends on I2C && VIDEO_V4L2
-       select MFD_CORE
        select MFD_WL1273_CORE
        select FW_LOADER
        ---help---

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9c1347dc7a4af14ebb9df98cd5ce0e3f0331becf..ac8bd4feb047c2498eccbf25933258715844dae1 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2,23 +2,8 @@
 # Multifunction miscellaneous devices
 #
 
-menuconfig MFD_SUPPORT
-       bool "Multifunction device drivers"
-       depends on HAS_IOMEM
-       default y
-       help
-         Multifunction devices embed several functions (e.g. GPIOs,
-         touchscreens, keyboards, current regulators, power management chips,
-         etc...) in one single integrated circuit. They usually talk to the
-         main CPU through one or more IRQ lines and low speed data busses (SPI,
-         I2C, etc..). They appear as one single device to the main system
-         through the data bus and the MFD framework allows for sub devices
-         (a.k.a. functions) to appear as discrete platform devices.
-         MFDs are typically found on embedded platforms.
-
-         This option alone does not add any kernel code.
-
-if MFD_SUPPORT
+if HAS_IOMEM
+menu "Multifunction device drivers"
 
 config MFD_CORE
        tristate
@@ -772,7 +757,8 @@ config MFD_AAT2870_CORE
          additional drivers must be enabled in order to use the
          functionality of the device.
 
-endif # MFD_SUPPORT
+endmenu
+endif
 
 menu "Multimedia Capabilities Port drivers"
        depends on ARCH_SA1100