diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
| commit | 76e8de404a34bfff318da0b31e752db2642511f3 (patch) | |
| tree | f486e22499fc5ce7548b76f299ecb91f52baf8ed /drivers/power/Kconfig | |
| parent | e9b3bd248b349433215cf01064a866b632fb3f4b (diff) | |
| parent | 354d86f4daecdc3553830e553f6fc17add736234 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultzv3.10/topic/android-fixes
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 430ef8c8b6a..7b8979c63f4 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -204,16 +204,6 @@ config BATTERY_MAX17042 with MAX17042. This driver also supports max17047/50 chips which are improved version of max17042. -config BATTERY_ANDROID - tristate "Battery driver for Android" - help - Say Y to enable generic support for battery charging according - to common Android policies. - This driver adds periodic battery level and health monitoring, - kernel log reporting and other debugging features, common board - battery file glue logic for battery/case temperature sensors, - etc. - config BATTERY_Z2 tristate "Z2 battery driver" depends on I2C && MACH_ZIPIT2 |