Skip to content

Commit

Permalink
Merge git://git.infradead.org/battery-2.6
Browse files Browse the repository at this point in the history 
* git://git.infradead.org/battery-2.6:
  Don't compile the PMU power driver on 64-bit PowerPC
  • Loading branch information
Linus Torvalds committed Aug 3, 2007
2 parents 34bac23 + a1da5f4 commit 195be1c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/power/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 195be1c

Please sign in to comment.