diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /arch/mips/kernel/traps.c | |
parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
download | kernel-crypto-dea58b80f2625d3712645fb6ff0af45866cedaae.tar.gz kernel-crypto-dea58b80f2625d3712645fb6ff0af45866cedaae.tar.xz kernel-crypto-dea58b80f2625d3712645fb6ff0af45866cedaae.zip |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/mips/kernel/traps.c')
-rw-r--r-- | arch/mips/kernel/traps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 4901f0a37fc..35cb08da382 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -902,6 +902,7 @@ static inline void parity_protection_init(void) { switch (current_cpu_data.cputype) { case CPU_24K: + case CPU_34K: case CPU_5KC: write_c0_ecc(0x80000000); back_to_back_c0_hazard(); |