Merge branch 'topic/misc' into for-linus

[safe/jmp/linux-2.6] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 84a68d2..2a5a0b7 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -11,7 +11,7 @@ config MFD_CORE
 
 config MFD_88PM860X
        bool "Support Marvell 88PM8606/88PM8607"
-       depends on I2C=y
+       depends on I2C=y && GENERIC_HARDIRQS
        select MFD_CORE
        help
          This supports for Marvell 88PM8606/88PM8607 Power Management IC.
@@ -47,7 +47,7 @@ config MFD_ASIC3
 
 config MFD_SH_MOBILE_SDHI
        bool "Support for SuperH Mobile SDHI"
-       depends on SUPERH
+       depends on SUPERH || ARCH_SHMOBILE
        select MFD_CORE
         ---help---
          This driver supports the SDHI hardware block found in many
@@ -205,7 +205,7 @@ config PMIC_ADP5520
 
 config MFD_MAX8925
        bool "Maxim Semiconductor MAX8925 PMIC Support"
-       depends on I2C=y
+       depends on I2C=y && GENERIC_HARDIRQS
        select MFD_CORE
        help
          Say yes here to support for Maxim Semiconductor MAX8925. This is
@@ -226,7 +226,7 @@ config MFD_WM8400
 config MFD_WM831X
        bool "Support Wolfson Microelectronics WM831x/2x PMICs"
        select MFD_CORE
-       depends on I2C=y
+       depends on I2C=y && GENERIC_HARDIRQS
        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
          This driver provides common support for accessing the device,
@@ -235,6 +235,7 @@ config MFD_WM831X
 
 config MFD_WM8350
        bool
+       depends on GENERIC_HARDIRQS
 
 config MFD_WM8350_CONFIG_MODE_0
        bool
@@ -287,7 +288,7 @@ config MFD_WM8352_CONFIG_MODE_3
 config MFD_WM8350_I2C
        bool "Support Wolfson Microelectronics WM8350 with I2C"
        select MFD_WM8350
-       depends on I2C=y
+       depends on I2C=y && GENERIC_HARDIRQS
        help
          The WM8350 is an integrated audio and power management
          subsystem with watchdog and RTC functionality for embedded
@@ -389,6 +390,15 @@ config MFD_TIMBERDALE
 
        The timberdale FPGA can be found on the Intel Atom development board
        for in-vehicle infontainment, called Russellville.
+
+config LPC_SCH
+       tristate "Intel SCH LPC"
+       depends on PCI
+       select MFD_CORE
+       help
+         LPC bridge function of the Intel SCH provides support for
+         System Management Bus and General Purpose I/O.
+
 endmenu
 
 menu "Multimedia Capabilities Port drivers"