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/Kconfig | |
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/Kconfig')
-rw-r--r-- | drivers/power/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index cea6cef27e89..118674925516 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -77,6 +77,13 @@ config BATTERY_TOSA Say Y to enable support for the battery on the Sharp Zaurus SL-6000 (tosa) models. +config BATTERY_COLLIE + tristate "Sharp SL-5500 (collie) battery" + depends on SA1100_COLLIE && MCP_UCB1200 + help + Say Y to enable support for the battery on the Sharp Zaurus + SL-5500 (collie) models. + config BATTERY_WM97XX bool "WM97xx generic battery driver" depends on TOUCHSCREEN_WM97XX=y |