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
This commit is contained in:
Linus Torvalds 2007-08-03 15:08:30 -07:00
commit 195be1c208

View file

@ -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.