Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

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

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index d5dee79b117d4165d67e22e4fc2388fe9f18325c..70184898195e7ca24ec55d417afbed2fc1784696 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_APM_POWER)               += apm_power.o
 obj-$(CONFIG_MAX8925_POWER)    += max8925_power.o
 obj-$(CONFIG_WM831X_BACKUP)    += wm831x_backup.o
 obj-$(CONFIG_WM831X_POWER)     += wm831x_power.o
+obj-$(CONFIG_WM831X_CHARGER_DISPLAY)   += wm831x_charger_display.o
 obj-$(CONFIG_WM8350_POWER)     += wm8350_power.o
 obj-$(CONFIG_TEST_POWER)       += test_power.o
 
@@ -37,5 +38,9 @@ obj-$(CONFIG_BATTERY_MAX17040)        += max17040_battery.o
 obj-$(CONFIG_BATTERY_Z2)       += z2_battery.o
 obj-$(CONFIG_BATTERY_S3C_ADC)  += s3c_adc_battery.o
 obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
+obj-$(CONFIG_BATTERY_STC3100)  += stc3100_battery.o
+obj-$(CONFIG_BATTERY_BQ27510)  += bq27510_battery.o
+obj-$(CONFIG_BATTERY_BQ27541)  += bq27541_battery.o
+obj-$(CONFIG_BATTERY_BQ3060)   += bq3060_battery.o
 obj-$(CONFIG_BATTERY_JZ4740)   += jz4740-battery.o
 obj-$(CONFIG_BATTERY_INTEL_MID)        += intel_mid_battery.o