diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 16:53:09 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 16:53:12 +0000 |
| commit | ba71e17269633ea36e776d744d5cc0fcb5a41f93 (patch) | |
| tree | 0a51c86e5c218ac2ae74ff8193880a64053a77bc /drivers/power/Makefile | |
| parent | ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request (diff) | |
| parent | collie: support pda_power driver (diff) | |
| download | linux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.tar.xz linux-dev-ba71e17269633ea36e776d744d5cc0fcb5a41f93.zip | |
Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100
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 b96f29d91c28..356cdfd3c8b2 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -24,6 +24,7 @@ obj-$(CONFIG_BATTERY_DS2782) += ds2782_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_COLLIE) += collie_battery.o obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o |