Commit 195be1c2 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 34bac238 a1da5f4f
...@@ -38,7 +38,7 @@ config BATTERY_DS2760 ...@@ -38,7 +38,7 @@ config BATTERY_DS2760
config BATTERY_PMU config BATTERY_PMU
tristate "Apple PMU battery" tristate "Apple PMU battery"
depends on ADB_PMU depends on PPC32 && ADB_PMU
help help
Say Y here to expose battery information on Apple machines Say Y here to expose battery information on Apple machines
through the generic battery class. through the generic battery class.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment