diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
| commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
| tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /drivers/macintosh/Kconfig | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/macintosh/Kconfig')
| -rw-r--r-- | drivers/macintosh/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 7d4a0ac28c06..12ad462737ba 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -187,6 +187,14 @@ config WINDFARM_PM91 | |||
| 187 | This driver provides thermal control for the PowerMac9,1 | 187 | This driver provides thermal control for the PowerMac9,1 |
| 188 | which is the recent (SMU based) single CPU desktop G5 | 188 | which is the recent (SMU based) single CPU desktop G5 |
| 189 | 189 | ||
| 190 | config WINDFARM_PM112 | ||
| 191 | tristate "Support for thermal management on PowerMac11,2" | ||
| 192 | depends on WINDFARM && I2C && PMAC_SMU | ||
| 193 | select I2C_POWERMAC | ||
| 194 | help | ||
| 195 | This driver provides thermal control for the PowerMac11,2 | ||
| 196 | which are the recent dual and quad G5 machines using the | ||
| 197 | 970MP dual-core processor. | ||
| 190 | 198 | ||
| 191 | config ANSLCD | 199 | config ANSLCD |
| 192 | tristate "Support for ANS LCD display" | 200 | tristate "Support for ANS LCD display" |