Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 7f8477d3a66128add17a44a5455dea6787e7248b..1a86387e23be2ebd541ad6fef1fbdff2949896fa 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -1,6 +1,6 @@
 
 menu "Macintosh device drivers"
-       depends on PPC || MAC
+       depends on PPC || MAC || X86
 
 config ADB
        bool "Apple Desktop Bus (ADB) support"
@@ -162,7 +162,6 @@ config INPUT_ADBHID
 
 config MAC_EMUMOUSEBTN
        bool "Support for mouse button 2+3 emulation"
-       depends on INPUT_ADBHID
        help
          This provides generic support for emulating the 2nd and 3rd mouse
          button with keypresses.  If you say Y here, the emulation is still
@@ -228,4 +227,11 @@ config ANSLCD
        tristate "Support for ANS LCD display"
        depends on ADB_CUDA && PPC_PMAC
 
+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
+          blue LEDs "vu-meter" of the XServer macs.
+
 endmenu