Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[net-next-2.6.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9735f581574db14fd00796814e38f9fa7acb5a1e..3a1493b8b5e565c1f5f263494efc1bc6a1405034 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -315,14 +315,30 @@ config MFD_WM8400
          the functionality of the device.
 
 config MFD_WM831X
-       bool "Support Wolfson Microelectronics WM831x/2x PMICs"
+       bool
+       depends on GENERIC_HARDIRQS
+
+config MFD_WM831X_I2C
+       bool "Support Wolfson Microelectronics WM831x/2x PMICs with I2C"
        select MFD_CORE
+       select MFD_WM831X
        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,
-         additional drivers must be enabled in order to use the
-         functionality of the device.
+         Support for the Wolfson Microelecronics WM831x and WM832x PMICs
+         when controlled using I2C.  This driver provides common support
+         for accessing the device, additional drivers must be enabled in
+         order to use the functionality of the device.
+
+config MFD_WM831X_SPI
+       bool "Support Wolfson Microelectronics WM831x/2x PMICs with SPI"
+       select MFD_CORE
+       select MFD_WM831X
+       depends on SPI_MASTER && GENERIC_HARDIRQS
+       help
+         Support for the Wolfson Microelecronics WM831x and WM832x PMICs
+         when controlled using SPI.  This driver provides common support
+         for accessing the device, additional drivers must be enabled in
+         order to use the functionality of the device.
 
 config MFD_WM8350
        bool
@@ -409,11 +425,16 @@ config MFD_PCF50633
          so that function-specific drivers can bind to them.
 
 config MFD_MC13783
-       tristate "Support Freescale MC13783"
+       tristate
+
+config MFD_MC13XXX
+       tristate "Support Freescale MC13783 and MC13892"
        depends on SPI_MASTER
        select MFD_CORE
+       select MFD_MC13783
        help
-         Support for the Freescale (Atlas) MC13783 PMIC and audio CODEC.
+         Support for the Freescale (Atlas) PMIC and audio CODECs
+         MC13783 and MC13892.
          This driver provides common support for accessing  the device,
          additional drivers must be enabled in order to use the
          functionality of the device.