commit | 682bf91f67159b41465b1f101be04abbc855c9b9 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Thu Nov 01 15:57:11 2012 -0700 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Nov 01 15:57:10 2012 -0700 |
tree | 3748cec8529f9a4652c74c42cbeb29d811b87f43 | |
parent | 345e6fbdab6a26eaec2c5a3d4c71c801e7aa064c [diff] | |
parent | 43cbf555cdeb9eb509fecb97d0fdf32def71cc26 [diff] |
Merge "defconfig: msm8974: enable smb350 battery charger"
diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig index 47498d1..cbcd546 100644 --- a/arch/arm/configs/msm8974_defconfig +++ b/arch/arm/configs/msm8974_defconfig
@@ -273,6 +273,7 @@ CONFIG_GPIO_QPNP_PIN_DEBUG=y CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_BQ28400=y +CONFIG_SMB350_CHARGER=y CONFIG_QPNP_CHARGER=y CONFIG_QPNP_BMS=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y