diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 18:11:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 18:11:00 -0800 |
| commit | 0d514f040ac6629311974889d5b96bcf21c6461a (patch) | |
| tree | af11d40688eabe88f25d21a1af847a761cb3a843 /drivers/macintosh/windfarm_cpufreq_clamp.c | |
| parent | 5ee1af9f519e6dc5a7d7912e87a1aaec857c8818 (diff) | |
| parent | 1bd79336a426c5e4f3bab142407059ceb12cadf9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: Fix various syscall/signal/swapcontext bugs
[PATCH] powerpc: incorrect rmo_top handling in prom_init
[PATCH] powerpc: Fix incorrect pud_ERROR() message
[PATCH] powerpc: Expose SMT and L1 icache snoop userland features
[PATCH] powerpc: Fix windfarm_pm112 not starting all control loops
[PATCH] powerpc: Fix old g5 issues with windfarm
powerpc32: Fix timebase synchronization on 32-bit powermacs
powerpc: Turn off verbose debug output in powermac platform functions
powerpc: Fix might-sleep warning in program check exception handler
Diffstat (limited to 'drivers/macintosh/windfarm_cpufreq_clamp.c')
| -rw-r--r-- | drivers/macintosh/windfarm_cpufreq_clamp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c index 607dbaca69c..81337cd16e8 100644 --- a/drivers/macintosh/windfarm_cpufreq_clamp.c +++ b/drivers/macintosh/windfarm_cpufreq_clamp.c @@ -8,6 +8,8 @@ #include <linux/wait.h> #include <linux/cpufreq.h> +#include <asm/prom.h> + #include "windfarm.h" #define VERSION "0.3" @@ -74,6 +76,12 @@ static int __init wf_cpufreq_clamp_init(void) { struct wf_control *clamp; + /* Don't register on old machines that use therm_pm72 for now */ + if (machine_is_compatible("PowerMac7,2") || + machine_is_compatible("PowerMac7,3") || + machine_is_compatible("RackMac3,1")) + return -ENODEV; + clamp = kmalloc(sizeof(struct wf_control), GFP_KERNEL); if (clamp == NULL) return -ENOMEM; |