diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 09:44:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 09:44:30 -0700 |
| commit | 7d67474e506598fe26e0c262acf02132dc730517 (patch) | |
| tree | 45ad83d853a1a461f8c86b964861336e4e913851 /drivers/power/Makefile | |
| parent | 252883e512c6d8fbc03b6738f1620fda44c4d472 (diff) | |
| parent | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (diff) | |
| download | kernel_samsung_espresso10-7d67474e506598fe26e0c262acf02132dc730517.zip kernel_samsung_espresso10-7d67474e506598fe26e0c262acf02132dc730517.tar.gz kernel_samsung_espresso10-7d67474e506598fe26e0c262acf02132dc730517.tar.bz2 | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
bq27x00_battery: use unaligned access helper
power_supply: fix dependency of tosa_battery
power_supply: Support for Texas Instruments BQ27200 battery managers
power_supply: Add function to return system-wide power state
pda_power: Check and handle return value of set_irq_wake
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 4e20026..e8f1ece 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -21,4 +21,5 @@ obj-$(CONFIG_BATTERY_DS2760) += ds2760_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_WM97XX) += wm97xx_battery.o
\ No newline at end of file +obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o +obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o |