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 4d17d384578d7214ccbd08cac71d5b9c8a1809b1..9ce55850271a17c21365dee317f43219756eff53 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -49,6 +49,13 @@ config BATTERY_OLPC
        help
          Say Y to enable support for the battery on the OLPC laptop.
 
+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