revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d2924a2cf3cdca63b2431cefd6cb8241f1fe9fbc..db51ea1c608250be267a6430c6d808a77530e48d 100755 (executable)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -523,12 +523,6 @@ config MFD_RDC321X
          southbridge which provides access to GPIOs and Watchdog using the
          southbridge PCI device configuration space.
 
-config MFD_CPCAP
-       tristate "Support for CPCAP"
-       depends on SPI && FIRMWARE_IN_KERNEL
-       help
-        Say yes here if you want to include drivers for the CPCAP chip.
-
 config MFD_JANZ_CMODIO
        tristate "Support for Janz CMOD-IO PCI MODULbus Carrier Board"
        select MFD_CORE
@@ -548,8 +542,8 @@ config MFD_JZ4740_ADC
          This driver is necessary for jz4740-battery and jz4740-hwmon driver.
 
 config MFD_TPS6586X
-       bool "TPS6586x Power Management chips"
-       depends on I2C && GPIOLIB && GENERIC_HARDIRQS
+       tristate "TPS6586x Power Management chips"
+       depends on I2C && GPIOLIB
        select MFD_CORE
        help
          If you say yes here you get support for the TPS6586X series of