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/Makefile | |
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/Makefile')
-rw-r--r-- | drivers/power/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 27d9deef51b..653bf6ceff3 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -16,7 +16,6 @@ obj-$(CONFIG_WM8350_POWER) += wm8350_power.o obj-$(CONFIG_TEST_POWER) += test_power.o obj-$(CONFIG_BATTERY_88PM860X) += 88pm860x_battery.o -obj-$(CONFIG_BATTERY_ANDROID) += android_battery.o obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o obj-$(CONFIG_BATTERY_DS2780) += ds2780_battery.o obj-$(CONFIG_BATTERY_DS2781) += ds2781_battery.o |