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 3f6e176e6ea1b5dde193fa3ad78a17d20c92a181..58c806e9c58a2a941578fe9a629d0187b8ea777b 100644 (file)
--- 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.