X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fpower%2FKconfig;h=58c806e9c58a2a941578fe9a629d0187b8ea777b;hb=532df780a2012ad75b3f078647f229c4dabd99d1;hp=ab9c3e5a7c1dae99e905a54de131d28736d42e24;hpb=0f166396e7e8931bb4acfd1a6ea1bd4f0b43f1dd;p=~andy%2Flinux

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index ab9c3e5a7c1..58c806e9c58 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
@@ -37,7 +38,7 @@ config BATTERY_DS2760
 
 config BATTERY_PMU
 	tristate "Apple PMU battery"
-	depends on ADB_PMU
+	depends on PPC32 && ADB_PMU
 	help
 	  Say Y here to expose battery information on Apple machines
 	  through the generic battery class.