Merge branch 'master'

[powerpc.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 91691a6..a0ea44c 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -4,7 +4,7 @@ menu "Macintosh device drivers"
 
 config ADB
        bool "Apple Desktop Bus (ADB) support"
-       depends on MAC || PPC_PMAC
+       depends on MAC || (PPC_PMAC && PPC32)
        help
          Apple Desktop Bus (ADB) support is for support of devices which
          are connected to an ADB port.  ADB devices tend to have 4 pins.
@@ -103,7 +103,7 @@ config PMAC_MEDIABAY
 # on non-powerbook machines (but only on PMU based ones AFAIK)
 config PMAC_BACKLIGHT
        bool "Backlight control for LCD screens"
-       depends on ADB_PMU
+       depends on ADB_PMU && (BROKEN || !PPC64)
        help
          Say Y here to build in code to manage the LCD backlight on a
          Macintosh PowerBook.  With this code, the backlight will be turned
@@ -169,6 +169,25 @@ config THERM_PM72
          This driver provides thermostat and fan control for the desktop
          G5 machines. 
 
+config WINDFARM
+       tristate "New PowerMac thermal control infrastructure"
+
+config WINDFARM_PM81
+       tristate "Support for thermal management on iMac G5"
+       depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
+       select I2C_PMAC_SMU
+       help
+         This driver provides thermal control for the iMacG5
+
+config WINDFARM_PM91
+       tristate "Support for thermal management on PowerMac9,1"
+       depends on WINDFARM && I2C && CPU_FREQ_PMAC64 && PMAC_SMU
+       select I2C_PMAC_SMU
+       help
+         This driver provides thermal control for the PowerMac9,1
+          which is the recent (SMU based) single CPU desktop G5
+
+
 config ANSLCD
        tristate "Support for ANS LCD display"
        depends on ADB_CUDA && PPC_PMAC