Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 951fa9b..3c6a986 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.
@@ -49,10 +49,15 @@ config MFD_SH_MOBILE_SDHI
        bool "Support for SuperH Mobile SDHI"
        depends on SUPERH || ARCH_SHMOBILE
        select MFD_CORE
+       select TMIO_MMC_DMA
         ---help---
          This driver supports the SDHI hardware block found in many
          SuperH Mobile SoCs.
 
+config MFD_DAVINCI_VOICECODEC
+       tristate
+       select MFD_CORE
+
 config MFD_DM355EVM_MSP
        bool "DaVinci DM355 EVM microcontroller"
        depends on I2C && MACH_DAVINCI_DM355_EVM
@@ -158,6 +163,11 @@ config MFD_TMIO
        bool
        default n
 
+config TMIO_MMC_DMA
+       bool
+       select DMA_ENGINE
+       select DMADEVICES
+
 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
        depends on ARM && HAVE_CLK
@@ -205,7 +215,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 +236,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 +245,7 @@ config MFD_WM831X
 
 config MFD_WM8350
        bool
+       depends on GENERIC_HARDIRQS
 
 config MFD_WM8350_CONFIG_MODE_0
        bool
@@ -287,7 +298,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
@@ -296,9 +307,9 @@ config MFD_WM8350_I2C
          selected to enable support for the functionality of the chip.
 
 config MFD_WM8994
-       tristate "Support Wolfson Microelectronics WM8994"
+       bool "Support Wolfson Microelectronics WM8994"
        select MFD_CORE
-       depends on I2C
+       depends on I2C=y && GENERIC_HARDIRQS
        help
          The WM8994 is a highly integrated hi-fi CODEC designed for
          smartphone applicatiosn.  As well as audio functionality it