summaryrefslogtreecommitdiffstats
path: root/drivers/power/Makefile
diff options
context:
space:
mode:
authorMarcus Cooper2012-08-10 12:59:06 +0200
committerLee Jones2013-03-07 05:35:46 +0100
commit405fea1c6691eb8259f2ca879c9348a4cf5d898d (patch)
tree87c46072f050cf5a4358c3ba59bda5b0d9558753 /drivers/power/Makefile
parentab8500-charger: Add AB8505_USB_LINK_STATUS (diff)
downloadkernel-qcow2-linux-405fea1c6691eb8259f2ca879c9348a4cf5d898d.tar.gz
kernel-qcow2-linux-405fea1c6691eb8259f2ca879c9348a4cf5d898d.tar.xz
kernel-qcow2-linux-405fea1c6691eb8259f2ca879c9348a4cf5d898d.zip
pm2301-charger: Always compile the PM2301 Charger driver with AB8500 Battery Mgnt
The PM2301 Charger should always be available when using the AB8500 Battery Management system, we're ensuring this will be the case. Signed-off-by: Marcus Cooper <marcus.xm.cooper@stericsson.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Hakan BERG <hakan.berg@stericsson.com> Reviewed-by: Mian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com>
Diffstat (limited to 'drivers/power/Makefile')
-rw-r--r--drivers/power/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 3f66436af45c..eb520ea74970 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -39,7 +39,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_fg.o ab8500_btemp.o abx500_chargalg.o
+obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o
obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
@@ -47,7 +47,6 @@ obj-$(CONFIG_CHARGER_LP8727) += lp8727_charger.o
obj-$(CONFIG_CHARGER_LP8788) += lp8788-charger.o
obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o
obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o
-obj-$(CONFIG_CHARGER_PM2301) += pm2301_charger.o
obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o
obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o
obj-$(CONFIG_CHARGER_BQ2415X) += bq2415x_charger.o