diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /drivers/power | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/power')
| -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. |