diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /drivers/power/Kconfig | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
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 e3a9c37d08f6..9ce55850271a 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -56,4 +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 | ||
| 60 | tristate "Palm T|X battery" | ||
| 61 | depends on MACH_PALMTX | ||
| 62 | help | ||
| 63 | Say Y to enable support for the battery in Palm T|X. | ||
| 64 | |||
| 59 | endif # POWER_SUPPLY | 65 | endif # POWER_SUPPLY |