Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 74d4893..f1391c2 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -390,6 +390,7 @@ config MFD_WM831X_I2C
        bool "Support Wolfson Microelectronics WM831x/2x PMICs with I2C"
        select MFD_CORE
        select MFD_WM831X
+       select REGMAP_I2C
        depends on I2C=y && GENERIC_HARDIRQS
        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs
@@ -401,6 +402,7 @@ config MFD_WM831X_SPI
        bool "Support Wolfson Microelectronics WM831x/2x PMICs with SPI"
        select MFD_CORE
        select MFD_WM831X
+       select REGMAP_SPI
        depends on SPI_MASTER && GENERIC_HARDIRQS
        help
          Support for the Wolfson Microelecronics WM831x and WM832x PMICs
@@ -474,6 +476,7 @@ config MFD_WM8350_I2C
 config MFD_WM8994
        bool "Support Wolfson Microelectronics WM8994"
        select MFD_CORE
+       select REGMAP_I2C
        depends on I2C=y && GENERIC_HARDIRQS
        help
          The WM8994 is a highly integrated hi-fi CODEC designed for