projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch develop-3.10 into develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
configs
/
rockchip_defconfig
diff --git
a/arch/arm/configs/rockchip_defconfig
b/arch/arm/configs/rockchip_defconfig
index 6fb723c95b79de4ea35fb25f917d10b16c27219f..7d88cf9d7bc7758d2ee15cf4b3136749537f622f 100644
(file)
--- a/
arch/arm/configs/rockchip_defconfig
+++ b/
arch/arm/configs/rockchip_defconfig
@@
-357,6
+357,7
@@
CONFIG_BATTERY_BQ24296=y
CONFIG_BATTERY_BQ27320=y
CONFIG_BATTERY_RK30_ADC_FAC=y
CONFIG_CW2015_BATTERY=y
+CONFIG_BATTERY_RK818=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y
CONFIG_SENSORS_ROCKCHIP_TSADC=y