diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-04 00:08:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-04 00:08:30 +0200 |
| commit | 195be1c2086929efe1ca315e23f031f06e086369 (patch) | |
| tree | cc3b8d03b6c668a61077c761e1acc66943f2427b | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23 (diff) | |
| parent | Don't compile the PMU power driver on 64-bit PowerPC (diff) | |
| download | linux-195be1c2086929efe1ca315e23f031f06e086369.tar.xz linux-195be1c2086929efe1ca315e23f031f06e086369.zip | |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 3f6e176e6ea1..58c806e9c58a 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. |