diff options
| author |   Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-30 02:05:23 +0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-30 02:05:23 +0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /drivers/power/Makefile | |
| parent | power_supply: Sharp SL-6000 (tosa) batteries support (diff) | |
| parent | Linux 2.6.27-rc1 (diff) | |
| download | linux-dev-9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6.tar.xz linux-dev-9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6.zip | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 1e408fa268cf..4706bf8ff459 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -21,3 +21,4 @@ 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_PALMTX) += palmtx_battery.o |