diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/macintosh/Kconfig | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/macintosh/Kconfig')
| -rw-r--r-- | drivers/macintosh/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index dc6003859e54..d5d649f5ccdb 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -109,7 +109,7 @@ config PMAC_SMU | |||
| 109 | 109 | ||
| 110 | config PMAC_APM_EMU | 110 | config PMAC_APM_EMU |
| 111 | tristate "APM emulation" | 111 | tristate "APM emulation" |
| 112 | depends on PPC_PMAC && PPC32 && PM | 112 | depends on PPC_PMAC && PPC32 && PM && ADB_PMU |
| 113 | 113 | ||
| 114 | config PMAC_MEDIABAY | 114 | config PMAC_MEDIABAY |
| 115 | bool "Support PowerBook hotswap media bay" | 115 | bool "Support PowerBook hotswap media bay" |
| @@ -122,7 +122,8 @@ config PMAC_MEDIABAY | |||
| 122 | 122 | ||
| 123 | config PMAC_BACKLIGHT | 123 | config PMAC_BACKLIGHT |
| 124 | bool "Backlight control for LCD screens" | 124 | bool "Backlight control for LCD screens" |
| 125 | depends on ADB_PMU && (BROKEN || !PPC64) | 125 | depends on ADB_PMU && FB = y && (BROKEN || !PPC64) |
| 126 | select FB_BACKLIGHT | ||
| 126 | help | 127 | help |
| 127 | Say Y here to enable Macintosh specific extensions of the generic | 128 | Say Y here to enable Macintosh specific extensions of the generic |
| 128 | backlight code. With this enabled, the brightness keys on older | 129 | backlight code. With this enabled, the brightness keys on older |