diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /drivers/power/Kconfig | |
| parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
| parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
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 9ce55850271a..1982f8b42782 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -56,10 +56,10 @@ 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 |
| 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 | endif # POWER_SUPPLY | 65 | endif # POWER_SUPPLY |