Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index f44c94abd883f9b8731df64f1e0e37ce39766ee8..56cd8998fe4b76f35e7e47158cb0147d9f4cb159 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -2,7 +2,12 @@
 menuconfig MACINTOSH_DRIVERS
        bool "Macintosh device drivers"
        depends on PPC || MAC || X86
-       default y
+       default y if (PPC_PMAC || MAC)
+       ---help---
+         Say Y here to get to see options for devices used with Macintosh
+         computers. This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.
 
 if MACINTOSH_DRIVERS
 
@@ -114,7 +119,7 @@ config PMAC_SMU
 config PMAC_APM_EMU
        tristate "APM emulation"
        select APM_EMULATION
-       depends on ADB_PMU && PM
+       depends on ADB_PMU && PM && PPC32
 
 config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"