From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 3 Aug 2007 22:08:30 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.23-rc2~4
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=195be1c2086929efe1ca315e23f031f06e086369;hp=34bac238cc13cdb57f3b353b6e5ed3eae2cff158;p=linux-2.6-omap-h63xx.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  Don't compile the PMU power driver on 64-bit PowerPC
---

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 3f6e176e6ea..58c806e9c58 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -38,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.