commit cf49c6892d16a3e8a0566b9bd2fbeaedea235b12
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 14 08:34:23 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 14 08:34:20 2012 -0700
tree 12d7a85059cc76adf4977580d71d82397fe53b7a
parent 13378a279ad4b6df45d080b71999f051dd4520b5
parent 54cbc95f34b2fdc189aac102bcdd3637a5b64cdf

Merge "defconfig: 8960/8064: Enable Battery Current Limit"

arch/arm/configs/msm8960-perf_defconfig

diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig
index ad02480..bb5c7da 100644
--- a/arch/arm/configs/msm8960-perf_defconfig
+++ b/arch/arm/configs/msm8960-perf_defconfig
@@ -322,6 +322,7 @@
 CONFIG_SMB349_CHARGER=y
 CONFIG_PM8921_CHARGER=y
 CONFIG_PM8921_BMS=y
+CONFIG_BATTERY_BCL=y
 CONFIG_SENSORS_PM8XXX_ADC=y
 CONFIG_SENSORS_EPM_ADC=y
 CONFIG_THERMAL=y

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index ae72589..fb3befa 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -326,6 +326,7 @@
 CONFIG_SMB349_CHARGER=y
 CONFIG_PM8921_CHARGER=y
 CONFIG_PM8921_BMS=y
+CONFIG_BATTERY_BCL=y
 CONFIG_SENSORS_PM8XXX_ADC=y
 CONFIG_SENSORS_EPM_ADC=y
 CONFIG_THERMAL=y