diff options
author | Lee Jones <lee.jones@linaro.org> | 2014-03-19 08:57:53 +0000 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-03-19 08:57:53 +0000 |
commit | 0caeaede0bc0fdb5046e216b3897f316feaa5a65 (patch) | |
tree | e65dcf7d3fd54f53f1dda3375d117822e2c0571d /drivers/mfd/Kconfig | |
parent | 1a55361e21c252e751ed4b980c8e8c11f4ccd43e (diff) | |
parent | b2931b98cebfb30d940f248d2054b5268eae87a4 (diff) |
Merge branch 'ib-mfd-io-3.15' into HEAD
Diffstat (limited to 'drivers/mfd/Kconfig')
-rw-r--r-- | drivers/mfd/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 49bb445d846a..23a8a51f6860 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -935,16 +935,6 @@ config TWL4030_CORE high speed USB OTG transceiver, an audio codec (on most versions) and many other features. -config TWL4030_MADC - tristate "TI TWL4030 MADC" - depends on TWL4030_CORE - help - This driver provides support for triton TWL4030-MADC. The - driver supports both RT and SW conversion methods. - - This driver can be built as a module. If so it will be - named twl4030-madc - config TWL4030_POWER bool "TI TWL4030 power resources" depends on TWL4030_CORE && ARM |