X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpower%2FKconfig;h=58c806e9c58a2a941578fe9a629d0187b8ea777b;hb=66d715c95a39e84cd25204a665915621457d9691;hp=921456243e4bed5e2c89b5b3dd590ce9ebb3ee3d;hpb=fe0e3153acfef4864b69932cf116eb5f38f7500c;p=linux-2.6

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 921456243e..58c806e9c5 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -16,6 +16,7 @@ config POWER_SUPPLY_DEBUG
 
 config PDA_POWER
 	tristate "Generic PDA/phone power driver"
+	depends on !S390
 	help
 	  Say Y here to enable generic power driver for PDAs and phones with
 	  one or two external power supplies (AC/USB) connected to main and
@@ -35,4 +36,17 @@ config BATTERY_DS2760
 	help
 	  Say Y here to enable support for batteries with ds2760 chip.
 
+config BATTERY_PMU
+	tristate "Apple PMU battery"
+	depends on PPC32 && ADB_PMU
+	help
+	  Say Y here to expose battery information on Apple machines
+	  through the generic battery class.
+
+config BATTERY_OLPC
+	tristate "One Laptop Per Child battery"
+	depends on X86_32 && OLPC
+	help
+	  Say Y to enable support for the battery on the OLPC laptop.
+
 endif # POWER_SUPPLY