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

[pandora-kernel.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 8ebc0be..9f93c29 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -21,14 +21,14 @@ 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)
 
 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
@@ -45,6 +45,7 @@ config HTC_PASIC3
 config MFD_TC6393XB
        bool "Support Toshiba TC6393XB"
        depends on HAVE_GPIO_LIB
+       select MFD_CORE
        help
          Support for Toshiba Mobile IO Controller TC6393XB