Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 430ef8c8b6a808a09da9e0f99c8fb7ed7ff8de66..7b8979c63f4882e6c3e5375b9f9c35c40e5a829c 100644 (file)
--- 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