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 7ee1cf1914d30534d0760dd01b5ac9232f614f2a..70184898195e7ca24ec55d417afbed2fc1784696 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -16,20 +16,31 @@ obj-$(CONFIG_POWER_SUPPLY)  += power_supply.o
 
 obj-$(CONFIG_PDA_POWER)                += pda_power.o
 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
 
 obj-$(CONFIG_BATTERY_DS2760)   += ds2760_battery.o
+obj-$(CONFIG_BATTERY_DS2781)   += ds2781_battery.o
 obj-$(CONFIG_BATTERY_DS2782)   += ds2782_battery.o
 obj-$(CONFIG_BATTERY_PMU)      += pmu_battery.o
 obj-$(CONFIG_BATTERY_OLPC)     += olpc_battery.o
 obj-$(CONFIG_BATTERY_TOSA)     += tosa_battery.o
+obj-$(CONFIG_BATTERY_COLLIE)   += collie_battery.o
 obj-$(CONFIG_BATTERY_WM97XX)   += wm97xx_battery.o
+obj-$(CONFIG_CHARGER_BQ24617)  += bq24617_charger.o
 obj-$(CONFIG_BATTERY_BQ27x00)  += bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)   += da9030_battery.o
 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_RK2818)   += rk2818_battery.o
 obj-$(CONFIG_BATTERY_STC3100)  += stc3100_battery.o
 obj-$(CONFIG_BATTERY_BQ27510)  += bq27510_battery.o
-obj-$(CONFIG_BATTERY_BQ3060)   += bq3060_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