Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index a9e747c3979131179d6304755c693c815a2661f0..ee699a7d62148ba05efe4bb3b11ca31524f9b462 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -1,6 +1,10 @@
 
-menu "Macintosh device drivers"
-       depends on PPC || MAC
+menuconfig MACINTOSH_DRIVERS
+       bool "Macintosh device drivers"
+       depends on PPC || MAC || X86
+       default y
+
+if MACINTOSH_DRIVERS
 
 config ADB
        bool "Apple Desktop Bus (ADB) support"
@@ -109,7 +113,8 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
        tristate "APM emulation"
-       depends on PPC_PMAC && PPC32 && PM && ADB_PMU
+       select APM_EMULATION
+       depends on ADB_PMU && PM && PPC32
 
 config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"
@@ -231,7 +236,7 @@ config PMAC_RACKMETER
        tristate "Support for Apple XServe front panel LEDs"
        depends on PPC_PMAC
        help
-         This driver procides some support to control the front panel
+         This driver provides some support to control the front panel
           blue LEDs "vu-meter" of the XServer macs.
 
-endmenu
+endif # MACINTOSH_DRIVERS