summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-03 22:08:30 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-03 22:08:30 (GMT)
commit195be1c2086929efe1ca315e23f031f06e086369 (patch)
treecc3b8d03b6c668a61077c761e1acc66943f2427b
parent34bac238cc13cdb57f3b353b6e5ed3eae2cff158 (diff)
parenta1da5f4f1beb8cae83104a65f36afe527184a4ef (diff)
downloadlinux-3.10-195be1c2086929efe1ca315e23f031f06e086369.zip
linux-3.10-195be1c2086929efe1ca315e23f031f06e086369.tar.gz
linux-3.10-195be1c2086929efe1ca315e23f031f06e086369.tar.bz2
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
-rw-r--r--drivers/power/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 3f6e176..58c806e 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.