summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-11-21 22:57:20 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-11-21 22:57:20 +0000
commit464a3b821827ab828737b633ebb9964e1c71e910 (patch)
treec9ef8ad5353caa8ad3e4d084a885adc20e54740d /config-armv7-generic
parent772b620d713a3d73f9a2c053ba65e43fb84615f4 (diff)
downloadkernel-464a3b821827ab828737b633ebb9964e1c71e910.tar.gz
kernel-464a3b821827ab828737b633ebb9964e1c71e910.tar.xz
kernel-464a3b821827ab828737b633ebb9964e1c71e910.zip
Some minor ARM config updates
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic5
1 files changed, 4 insertions, 1 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 6f9d4bacc..930151a56 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -261,7 +261,6 @@ CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
# CONFIG_GPIO_RCAR is not set
CONFIG_W1_MASTER_GPIO=m
-CONFIG_CHARGER_GPIO=m
# SPI
CONFIG_SPI=y
@@ -411,6 +410,10 @@ CONFIG_REGULATOR_TPS65912=m
CONFIG_REGULATOR_TPS80031=m
CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_TPS65090=m
CONFIG_PDA_POWER=m
CONFIG_GENERIC_ADC_BATTERY=m