Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 80f45cd3f9fec51e3d3ab76d765953e389be7a52..7bd8c2b415756424e74bf50faad18285a4afdcaf 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -78,4 +78,17 @@ config TWL4030_BCI_BATTERY
          Support for OMAP TWL4030 BCI Battery driver.
          This driver can give support for TWL4030 Battery Charge Interface.
 
          Support for OMAP TWL4030 BCI Battery driver.
          This driver can give support for TWL4030 Battery Charge Interface.
 

+config BATTERY_TOSA
+       tristate "Sharp SL-6000 (tosa) battery"
+       depends on MACH_TOSA && MFD_TC6393XB
+       help
+         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
 endif # POWER_SUPPLY