diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /drivers/power/Kconfig | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 58c806e9c58a..4d17d384578d 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -49,4 +49,10 @@ config BATTERY_OLPC | |||
| 49 | help | 49 | help |
| 50 | Say Y to enable support for the battery on the OLPC laptop. | 50 | Say Y to enable support for the battery on the OLPC laptop. |
| 51 | 51 | ||
| 52 | config BATTERY_PALMTX | ||
| 53 | tristate "Palm T|X battery" | ||
| 54 | depends on MACH_PALMTX | ||
| 55 | help | ||
| 56 | Say Y to enable support for the battery in Palm T|X. | ||
| 57 | |||
| 52 | endif # POWER_SUPPLY | 58 | endif # POWER_SUPPLY |