summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/us3_cpufreq.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 13:50:52 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 13:50:52 -0700
commitcff6bf970965c98c62007fc8a36527fd147fe233 (patch)
tree2791f2208b54ade86625af416ff5342f11282f0c /arch/sparc64/kernel/us3_cpufreq.c
parent6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff)
parent39ca371c45b04cd50d0974030ae051906fc516b6 (diff)
downloadtalos-op-linux-cff6bf970965c98c62007fc8a36527fd147fe233.tar.gz
talos-op-linux-cff6bf970965c98c62007fc8a36527fd147fe233.zip
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc64/kernel/us3_cpufreq.c')
-rw-r--r--arch/sparc64/kernel/us3_cpufreq.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c
index 9080e7cd4bb0..0340041f6143 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;
OpenPOWER on IntegriCloud