diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:40:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:40:56 +0200 |
| commit | 251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 (patch) | |
| tree | 3c20c3e080f276848f2ad67aadab44a5d64bfda9 /drivers/power/Kconfig | |
| parent | 6679ce6e5f519096612b480d255d9ca97be0c2be (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/urgent
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 4d17d384578..9ce55850271 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -49,6 +49,13 @@ config BATTERY_OLPC help Say Y to enable support for the battery on the OLPC laptop. +config BATTERY_TOSA + tristate "Sharp SL-6000 (tosa) battery" + depends on MACH_TOSA && MFD_TC6393XB + help + Say Y to enable support for the battery on the Sharp Zaurus + SL-6000 (tosa) models. + config BATTERY_PALMTX tristate "Palm T|X battery" depends on MACH_PALMTX |