diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 12:28:24 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 12:28:24 -0400 |
| commit | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (patch) | |
| tree | bac4953f8899d6600f4716c0bcde1e25e34c2591 /drivers/power/Kconfig | |
| parent | 8aef7e8f8de2d900da892085edbf14ea35fe6881 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index ae095a498db4..8e0c2b47803c 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -56,11 +56,11 @@ config BATTERY_TOSA | |||
| 56 | Say Y to enable support for the battery on the Sharp Zaurus | 56 | Say Y to enable support for the battery on the Sharp Zaurus |
| 57 | SL-6000 (tosa) models. | 57 | SL-6000 (tosa) models. |
| 58 | 58 | ||
| 59 | config BATTERY_PALMTX | 59 | config BATTERY_WM97XX |
| 60 | tristate "Palm T|X battery" | 60 | bool "WM97xx generic battery driver" |
| 61 | depends on MACH_PALMTX | 61 | depends on TOUCHSCREEN_WM97XX=y |
| 62 | help | 62 | help |
| 63 | Say Y to enable support for the battery in Palm T|X. | 63 | Say Y to enable support for battery measured by WM97xx aux port. |
| 64 | 64 | ||
| 65 | config BATTERY_BQ27x00 | 65 | config BATTERY_BQ27x00 |
| 66 | tristate "BQ27200 battery driver" | 66 | tristate "BQ27200 battery driver" |