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>

1 files changed, 4 insertions, 18 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9c1347dc7a4a..ac8bd4feb047 100644
--- 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