summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2013-09-04 18:32:12 +0200
committerNicolas Chauvet <kwizart@gmail.com>2013-10-12 14:20:37 +0200
commit9f8f9a0d3055d6cc64054e093de2ec033f29b8ef (patch)
treecc384465841d4cea0ba9692b5c16bc4ef2665e0e
parentbbc60d95a1a3babe6da456df948d68c3cfae70d4 (diff)
downloadkernel-9f8f9a0d3055d6cc64054e093de2ec033f29b8ef.tar.gz
kernel-9f8f9a0d3055d6cc64054e093de2ec033f29b8ef.tar.xz
kernel-9f8f9a0d3055d6cc64054e093de2ec033f29b8ef.zip
Revert "Add few more regulator for paz00 (including rtc)"
This reverts commit 997bba708f14e006ca43e61848f4f6b2304ad77a.
-rw-r--r--config-armv717
1 files changed, 4 insertions, 13 deletions
diff --git a/config-armv7 b/config-armv7
index e693c9cd..b5a84df3 100644
--- a/config-armv7
+++ b/config-armv7
@@ -152,7 +152,6 @@ CONFIG_GPIO_TWL4030=m
CONFIG_GPIO_TWL6040=m
CONFIG_I2C_OMAP=m
CONFIG_CHARGER_TWL4030=m
-CONFIG_CHARGER_TPS65090=m
CONFIG_OMAP_WATCHDOG=m
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_MADC=m
@@ -187,8 +186,6 @@ CONFIG_NOP_USB_XCEIV=m
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_TPS65910=m
# CONFIG_RTC_DRV_TWL92330 is not set
CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTC_DRV_OMAP=m
@@ -522,9 +519,6 @@ CONFIG_NVEC_LEDS=y
CONFIG_NVEC_PAZ00=y
CONFIG_MFD_TPS6586X=y
CONFIG_GPIO_TPS6586X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_PALMAS=m
-CONFIG_GPIO_TPS65910=m
CONFIG_REGULATOR_TPS6586X=m
CONFIG_RTC_DRV_TPS6586X=m
@@ -612,27 +606,24 @@ CONFIG_REGULATOR_LP8755=m
# CONFIG_MFD_SEC_CORE is not set
# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_LP8788 is not set
-CONFIG_MFD_MAX8907=m
+# CONFIG_MFD_MAX8907 is not set
# CONFIG_MFD_TPS65912_I2C is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_MAX77686 is not set
# CONFIG_MFD_MAX77693 is not set
# CONFIG_MFD_MAX8997 is not set
-CONFIG_MFD_TPS65090=m
+# CONFIG_MFD_TPS65090 is not set
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_RC5T583 is not set
-CONFIG_MFD_PALMAS=m
+# CONFIG_MFD_PALMAS is not set
# CONFIG_MFD_DA9055 is not set
# CONFIG_MFD_SMSC is not set
-CONFIG_MFD_TPS65910=m
+# CONFIG_MFD_TPS65910 is not set
# CONFIG_MFD_AS3711 is not set
# CONFIG_PMIC_DA903X is not set
# CONFIG_PMIC_ADP5520 is not set
# CONFIG_REGULATOR_LP3972 is not set
# CONFIG_REGULATOR_LP872X is not set
-CONFIG_REGULATOR_PALMAS=m
-CONFIG_REGULATOR_TPS65090=m
-CONFIG_REGULATOR_TPS65910=m
# CONFIG_SGI_IOC4 is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set