| commit | 7a345d39c84e25903a40d0fde011a8c4bbc1a2b4 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri Nov 11 15:08:41 2011 -0800 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Fri Nov 11 15:08:41 2011 -0800 |
| tree | e3a767e3c0c120587e2afc1165e86b0fcac4655b | |
| parent | 7f7b641716132b81f0670cc16c4f66d44ab9e125 [diff] | |
| parent | ab519642bdbd0f50e6e6fa7b319d36ca8bede904 [diff] |
Merge "defconfig: msm8960: Enable isl9519q charger" into msm-3.0
diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig index 87bd3ef..be98991 100755 --- a/arch/arm/configs/msm8960_defconfig +++ b/arch/arm/configs/msm8960_defconfig
@@ -264,6 +264,7 @@ CONFIG_GPIO_SX150X=y CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_MSM is not set +CONFIG_ISL9519_CHARGER=y CONFIG_PM8921_CHARGER=y CONFIG_PM8921_BMS=y CONFIG_SENSORS_PM8921_ADC=y