Merge branch 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 87e84e7c71daa8c1442979b71475da5ece5a6eb1..4d92df6ef9fe92ac69c6f26e99e33f83e7e2ac71 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -736,9 +736,10 @@ config MFD_RTSX_PCI
        select MFD_CORE
        help
          This supports for Realtek PCI-Express card reader including rts5209,
-         rts5229, rtl8411, etc. Realtek card reader supports access to many
-         types of memory cards, such as Memory Stick, Memory Stick Pro,
-         Secure Digital and MultiMediaCard.
+         rts5227, rts522A, rts5229, rts5249, rts524A, rts525A, rtl8411, etc.
+         Realtek card reader supports access to many types of memory cards,
+         such as Memory Stick, Memory Stick Pro, Secure Digital and
+         MultiMediaCard.
 
 config MFD_RT5033
        tristate "Richtek RT5033 Power Management IC"
@@ -1070,6 +1071,7 @@ config MFD_PALMAS
 config TPS6105X
        tristate "TI TPS61050/61052 Boost Converters"
        depends on I2C
+       select REGMAP_I2C
        select REGULATOR
        select MFD_CORE
        select REGULATOR_FIXED_VOLTAGE
@@ -1482,7 +1484,7 @@ config MFD_WM8994
 
 config MFD_STW481X
        tristate "Support for ST Microelectronics STw481x"
-       depends on I2C && ARCH_NOMADIK
+       depends on I2C && (ARCH_NOMADIK || COMPILE_TEST)
        select REGMAP_I2C
        select MFD_CORE
        help