diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-11 11:55:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-11 11:55:56 +0100 |
| commit | e9b3bd248b349433215cf01064a866b632fb3f4b (patch) | |
| tree | 9821327345bdced3d895723cba1181d7ca399aca /drivers/power/Makefile | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 80475b849b90d8bed1fe768c496280f4b5c11410 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultz
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 653bf6ceff3..27d9deef51b 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -16,6 +16,7 @@ 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 |