Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 059c0a931526a134306c0d5f519770a2527eeead..b949cf85590c623610f1ada865114c3d709372f9 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -5,6 +5,7 @@ power_supply-$(CONFIG_SYSFS)            += power_supply_sysfs.o
 power_supply-$(CONFIG_LEDS_TRIGGERS)   += power_supply_leds.o
 
 obj-$(CONFIG_POWER_SUPPLY)     += power_supply.o
+obj-$(CONFIG_GENERIC_ADC_BATTERY)      += generic-adc-battery.o
 
 obj-$(CONFIG_PDA_POWER)                += pda_power.o
 obj-$(CONFIG_APM_POWER)                += apm_power.o