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

[safe/jmp/linux-2.6] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index ee699a7..fd85bde 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
 
@@ -118,7 +123,7 @@ config PMAC_APM_EMU
 
 config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"
-       depends on PPC_PMAC && PPC32
+       depends on PPC_PMAC && PPC32 && BLOCK
        help
          This option adds support for older PowerBook's hotswap media bay
          that can contains batteries, floppy drives, or IDE devices. PCI
@@ -133,7 +138,7 @@ config PMAC_BACKLIGHT
          Say Y here to enable Macintosh specific extensions of the generic
          backlight code. With this enabled, the brightness keys on older
          PowerBooks will be enabled so you can change the screen brightness.
-         Newer models should use an userspace daemon like pbbuttonsd.
+         Newer models should use a userspace daemon like pbbuttonsd.
 
 config PMAC_BACKLIGHT_LEGACY
        bool "Provide legacy ioctl's on /dev/pmu for the backlight"
@@ -166,7 +171,8 @@ config INPUT_ADBHID
          If unsure, say Y.
 
 config MAC_EMUMOUSEBTN
-       bool "Support for mouse button 2+3 emulation"
+       tristate "Support for mouse button 2+3 emulation"
+       depends on SYSCTL && INPUT
        help
          This provides generic support for emulating the 2nd and 3rd mouse
          button with keypresses.  If you say Y here, the emulation is still
@@ -178,6 +184,9 @@ config MAC_EMUMOUSEBTN
 
          If you have an Apple machine with a 1-button mouse, say Y here.
 
+         To compile this driver as a module, choose M here: the
+         module will be called mac_hid.
+
 config THERM_WINDTUNNEL
        tristate "Support for thermal management on Windtunnel G4s"
        depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
@@ -228,6 +237,14 @@ config WINDFARM_PM112
          which are the recent dual and quad G5 machines using the
          970MP dual-core processor.
 
+config WINDFARM_PM121
+       tristate "Support for thermal management on PowerMac12,1"
+       depends on WINDFARM && I2C && PMAC_SMU
+       select I2C_POWERMAC
+       help
+         This driver provides thermal control for the PowerMac12,1
+         which is the iMac G5 (iSight).
+
 config ANSLCD
        tristate "Support for ANS LCD display"
        depends on ADB_CUDA && PPC_PMAC