Merge branch 'master' of /home/cbou/linux-2.6

[~andy/linux] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index e3a9c37d08f69ac12c64de9490bb0257c30c8716..9ce55850271a17c21365dee317f43219756eff53 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -56,4 +56,10 @@ config BATTERY_TOSA
          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
+       help
+         Say Y to enable support for the battery in Palm T|X.
+
 endif # POWER_SUPPLY