1 files changed, 49 insertions, 2 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 10c44d3fe01a..5eff8ad834d6 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -21,7 +21,7 @@ config MFD_SM501
 
 config MFD_SM501_GPIO
         bool "Export GPIO via GPIO layer"
-        depends on MFD_SM501 && HAVE_GPIO_LIB
+        depends on MFD_SM501 && GPIOLIB
          ---help---
          This option uses the gpio library layer to export the 64 GPIO
          lines on the SM501. The platform data is used to supply the
@@ -29,7 +29,7 @@ config MFD_SM501_GPIO
 
 config MFD_ASIC3
         bool "Support for Compaq ASIC3"
-        depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
+        depends on GENERIC_HARDIRQS && GPIOLIB && ARM
          ---help---
           This driver supports the ASIC3 multifunction chip found on many
           PDAs (mainly iPAQ and HTC based ones)
@@ -50,6 +50,15 @@ config HTC_PASIC3
           HTC Magician devices, respectively. Actual functionality is
           handled by the leds-pasic3 and ds1wm drivers.
 
+config UCB1400_CORE
+        tristate "Philips UCB1400 Core driver"
+        help
+          This enables support for the Philips UCB1400 core functions.
+          The UCB1400 is an AC97 audio codec.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ucb1400_core.
+
 config MFD_TMIO
         bool
         default n
@@ -78,6 +87,44 @@ config MFD_TC6393XB
         help
           Support for Toshiba Mobile IO Controller TC6393XB
 
+config MFD_WM8400
+        tristate "Support Wolfson Microelectronics WM8400"
+        help
+          Support for the Wolfson Microelecronics WM8400 PMIC and audio
+          CODEC.  This driver adds provides common support for accessing
+          the device, additional drivers must be enabled in order to use
+          the functionality of the device.
+
+config MFD_WM8350
+        tristate
+
+config MFD_WM8350_CONFIG_MODE_0
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_1
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_2
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_CONFIG_MODE_3
+        bool
+        depends on MFD_WM8350
+
+config MFD_WM8350_I2C
+        tristate "Support Wolfson Microelectronics WM8350 with I2C"
+        select MFD_WM8350
+        depends on I2C
+        help
+          The WM8350 is an integrated audio and power management
+          subsystem with watchdog and RTC functionality for embedded
+          systems.  This option enables core support for the WM8350 with
+          I2C as the control interface.  Additional options must be
+          selected to enable support for the functionality of the chip.
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"