Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 2566479937c9e7ce224643069c6e13fbb10768c3..9f93c29fed355074cb443184da54343102c42625 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -5,6 +5,10 @@
 menu "Multifunction device drivers"
        depends on HAS_IOMEM
 
 menu "Multifunction device drivers"
        depends on HAS_IOMEM
 

+config MFD_CORE
+       tristate
+       default n
+

 config MFD_SM501
        tristate "Support for Silicon Motion SM501"
         ---help---
 config MFD_SM501
        tristate "Support for Silicon Motion SM501"
         ---help---


@@ -17,14 +21,14 @@ config MFD_SM501
 
 config MFD_ASIC3
        bool "Support for Compaq ASIC3"
 
 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)
 
 config HTC_EGPIO
        bool "HTC EGPIO support"
         ---help---
          This driver supports the ASIC3 multifunction chip found on many
          PDAs (mainly iPAQ and HTC based ones)
 
 config HTC_EGPIO
        bool "HTC EGPIO support"

-       depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB
+       depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM

        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input
        help
            This driver supports the CPLD egpio chip present on
            several HTC phones.  It provides basic support for input


@@ -38,6 +42,13 @@ config HTC_PASIC3
          HTC Magician devices, respectively. Actual functionality is
          handled by the leds-pasic3 and ds1wm drivers.
 
          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"
 endmenu
 
 menu "Multimedia Capabilities Port drivers"