Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ae96bd6242f2fef6638339fb8d74f36d85e3fa1a..9f93c29fed355074cb443184da54343102c42625 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -5,6 +5,10 @@
 menu "Multifunction device drivers"
        depends on HAS_IOMEM
 
+config MFD_CORE
+       tristate
+       default n
+
 config MFD_SM501
        tristate "Support for Silicon Motion SM501"
         ---help---
@@ -17,7 +21,7 @@ config MFD_SM501
 
 config MFD_ASIC3
        bool "Support for Compaq ASIC3"
-       depends on GENERIC_HARDIRQS && ARM
+       depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
         ---help---
          This driver supports the ASIC3 multifunction chip found on many
          PDAs (mainly iPAQ and HTC based ones)
@@ -38,6 +42,13 @@ config HTC_PASIC3
          HTC Magician devices, respectively. Actual functionality is
          handled by the leds-pasic3 and ds1wm drivers.
 
+config MFD_TC6393XB
+       bool "Support Toshiba TC6393XB"
+       depends on HAVE_GPIO_LIB
+       select MFD_CORE
+       help
+         Support for Toshiba Mobile IO Controller TC6393XB
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"