Merge branch 'work'

[linux-2.6] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index bc3e096d84f75a5660e1c98ba9db99d955a1a075..7d4a0ac28c065c2145d4f707c2a339c9ddb7caf4 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -149,14 +149,14 @@ config MAC_EMUMOUSEBTN
 
 config THERM_WINDTUNNEL
        tristate "Support for thermal management on Windtunnel G4s"
-       depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
+       depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
        help
          This driver provides some thermostat and fan control for the desktop
          G4 "Windtunnel"
 
 config THERM_ADT746X
        tristate "Support for thermal mgmnt on laptops with ADT 746x chipset"
-       depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
+       depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
        help
          This driver provides some thermostat and fan control for the
           iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty
@@ -164,11 +164,30 @@ config THERM_ADT746X
 
 config THERM_PM72
        tristate "Support for thermal management on PowerMac G5"
-       depends on I2C && I2C_KEYWEST && PPC_PMAC64
+       depends on I2C && I2C_POWERMAC && PPC_PMAC64
        help
          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_POWERMAC
+       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_POWERMAC
+       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