Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

[~andy/linux] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index dc6003859e540ded5a12c7368fb4483bc019c93d..d5d649f5ccdb3a05f14309fd1e11af83c7486a9f 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -109,7 +109,7 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
        tristate "APM emulation"
-       depends on PPC_PMAC && PPC32 && PM
+       depends on PPC_PMAC && PPC32 && PM && ADB_PMU
 
 config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"
@@ -122,7 +122,8 @@ config PMAC_MEDIABAY
 
 config PMAC_BACKLIGHT
        bool "Backlight control for LCD screens"
-       depends on ADB_PMU && (BROKEN || !PPC64)
+       depends on ADB_PMU && FB = y && (BROKEN || !PPC64)
+       select FB_BACKLIGHT
        help
          Say Y here to enable Macintosh specific extensions of the generic
          backlight code. With this enabled, the brightness keys on older