Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / power / Makefile

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 3b879ae54db1c8216abb0c516b10cbbecf86e8c7..7e688e752bed86dc279da06b875f84a1a58a04f9 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -27,3 +27,4 @@ obj-$(CONFIG_BATTERY_TOSA)    += tosa_battery.o
 obj-$(CONFIG_BATTERY_WM97XX)   += wm97xx_battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)  += bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)   += da9030_battery.o
+obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
\ No newline at end of file