diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-19 04:24:18 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-19 04:24:18 +0900 |
commit | a7a30232df01db886473324050d79c3122937c78 (patch) | |
tree | 76323b745b44b792173575843a72a2f6baa8a6da /drivers/mfd/Kconfig | |
parent | f86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff) | |
parent | fce9e5bb25264153f9f002eada41757118d25ba9 (diff) |
Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/dt-s5pv210
Diffstat (limited to 'drivers/mfd/Kconfig')
-rw-r--r-- | drivers/mfd/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index ee8204cc31e9..6cc4b6acc22a 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -760,6 +760,7 @@ config MFD_SYSCON config MFD_DAVINCI_VOICECODEC tristate select MFD_CORE + select REGMAP_MMIO config MFD_TI_AM335X_TSCADC tristate "TI ADC / Touch Screen chip support" @@ -1225,7 +1226,7 @@ config MFD_WM8994 functionaltiy of the device other drivers must be enabled. config MFD_STW481X - bool "Support for ST Microelectronics STw481x" + tristate "Support for ST Microelectronics STw481x" depends on I2C && ARCH_NOMADIK select REGMAP_I2C select MFD_CORE @@ -1248,7 +1249,7 @@ config MCP_SA11X0 # Chip drivers config MCP_UCB1200 - bool "Support for UCB1200 / UCB1300" + tristate "Support for UCB1200 / UCB1300" depends on MCP_SA11X0 select MCP |