diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-01-06 02:14:22 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-01-06 02:14:22 +0100 |
| commit | 240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983 (patch) | |
| tree | 8481027b056197db888e51eae47a8f95931b84cb /drivers/power/Makefile | |
| parent | charger_manager: Don't use [delayed_]work_pending() (diff) | |
| parent | ab8500_bm: Make the battery Device Tree node reference less cryptic (diff) | |
| download | linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.tar.xz linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.zip | |
Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 22c8913382c0..b11e0c7ea0f1 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_BATTERY_RX51) += rx51_battery.o -obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o +obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o |