diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 18:08:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 18:08:30 -0400 |
| commit | 195be1c2086929efe1ca315e23f031f06e086369 (patch) | |
| tree | cc3b8d03b6c668a61077c761e1acc66943f2427b /drivers | |
| parent | 34bac238cc13cdb57f3b353b6e5ed3eae2cff158 (diff) | |
| parent | a1da5f4f1beb8cae83104a65f36afe527184a4ef (diff) | |
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
Diffstat (limited to 'drivers')
| -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 | |||
| 38 | 38 | ||
| 39 | config BATTERY_PMU | 39 | config BATTERY_PMU |
| 40 | tristate "Apple PMU battery" | 40 | tristate "Apple PMU battery" |
| 41 | depends on ADB_PMU | 41 | depends on PPC32 && ADB_PMU |
| 42 | help | 42 | help |
| 43 | Say Y here to expose battery information on Apple machines | 43 | Say Y here to expose battery information on Apple machines |
| 44 | through the generic battery class. | 44 | through the generic battery class. |