Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

[mv-sheeva.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9f93c29fed355074cb443184da54343102c42625..5dba1651f9cc1d40aef4bb3c2bd91e0e3c2686a5 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -19,6 +19,14 @@ config MFD_SM501
          interface. The device may be connected by PCI or local bus with
          varying functions enabled.
 
+config MFD_SM501_GPIO
+       bool "Export GPIO via GPIO layer"
+       depends on MFD_SM501 && HAVE_GPIO_LIB
+        ---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
+        base number for the first GPIO line to register.
+
 config MFD_ASIC3
        bool "Support for Compaq ASIC3"
        depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
@@ -28,7 +36,7 @@ config MFD_ASIC3
 
 config HTC_EGPIO
        bool "HTC EGPIO support"
-       depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
+       depends on GENERIC_HARDIRQS && GPIOLIB && ARM
        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input
@@ -42,10 +50,40 @@ 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
+
+config MFD_T7L66XB
+       bool "Support Toshiba T7L66XB"
+       depends on ARM
+       select MFD_CORE
+       select MFD_TMIO
+       help
+         Support for Toshiba Mobile IO Controller T7L66XB
+
+config MFD_TC6387XB
+       bool "Support Toshiba TC6387XB"
+       depends on ARM
+       select MFD_CORE
+       select MFD_TMIO
+       help
+         Support for Toshiba Mobile IO Controller TC6387XB
+
 config MFD_TC6393XB
        bool "Support Toshiba TC6393XB"
-       depends on HAVE_GPIO_LIB
+       depends on GPIOLIB && ARM
        select MFD_CORE
+       select MFD_TMIO
        help
          Support for Toshiba Mobile IO Controller TC6393XB