summaryrefslogtreecommitdiffstats
path: root/drivers/power/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:59:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:59:33 -0800
commit48e902f0a3aea4b6b3a73e9d277b92024a493e6d (patch)
tree6dbb3a4c5ab4e7fc72172d8c11e7c0418b6559d1 /drivers/power/Makefile
parent7f6cd5408a8ace522ca7f15893243e94ccc913e0 (diff)
parent9d233e8bb92e355fd20b14745c1d9ff402e0e685 (diff)
downloadlinux-48e902f0a3aea4b6b3a73e9d277b92024a493e6d.tar.bz2
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply_sysfs: Handle -ENODATA in a special way wm831x_backup: Remove unused variables gta02: Set pcf50633 charger_reference_current_ma pcf50633: Query charger status directly pcf50633: Properly reenable charging when the supply conditions change pcf50633: Get rid of charging restart software auto-triggering pcf50633: introduces battery charging current control pcf50633: Add ac power supply class to the charger wm831x: Factor out WM831x backup battery charger
Diffstat (limited to 'drivers/power/Makefile')
-rw-r--r--drivers/power/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 356cdfd3c8b2..573597c683b4 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o
obj-$(CONFIG_PDA_POWER) += pda_power.o
obj-$(CONFIG_APM_POWER) += apm_power.o
+obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o
obj-$(CONFIG_WM831X_POWER) += wm831x_power.o
obj-$(CONFIG_WM8350_POWER) += wm8350_power.o