diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 08:55:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 08:55:43 -0700 |
commit | 6dec3cf5cdb600f39b9eac3349f6bf50eab87731 (patch) | |
tree | 868cecce3567d1d63591d38c8086294deb07620d /arch/sparc64/kernel/us3_cpufreq.c | |
parent | 82810a906f8734ae6503ea11436a7164d2f86f2e (diff) | |
parent | 705747ab87c96f1b4b8e73ba617c323d9087f6ac (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/us3_cpufreq.c')
-rw-r--r-- | arch/sparc64/kernel/us3_cpufreq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c index 9080e7cd4bb..0340041f614 100644 --- a/arch/sparc64/kernel/us3_cpufreq.c +++ b/arch/sparc64/kernel/us3_cpufreq.c @@ -208,7 +208,10 @@ static int __init us3_freq_init(void) impl = ((ver >> 32) & 0xffff); if (manuf == CHEETAH_MANUF && - (impl == CHEETAH_IMPL || impl == CHEETAH_PLUS_IMPL)) { + (impl == CHEETAH_IMPL || + impl == CHEETAH_PLUS_IMPL || + impl == JAGUAR_IMPL || + impl == PANTHER_IMPL)) { struct cpufreq_driver *driver; ret = -ENOMEM; |