Merge branch 'linus' into x86/xen

[linux-2.6-omap-h63xx.git] / arch / mips / dec / ecc-berr.c

diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c
index 6d55e8aab66830fa8dd5c388724dfe91baac735a..6a17c9b508eaa06dea5f66791e06e9f6f3d8dfc5 100644 (file)
--- a/arch/mips/dec/ecc-berr.c
+++ b/arch/mips/dec/ecc-berr.c
@@ -263,7 +263,7 @@ static inline void dec_kn03_be_init(void)
         */
        *mcr = (*mcr & ~(KN03_MCR_DIAGCHK | KN03_MCR_DIAGGEN)) |
               KN03_MCR_CORRECT;
-       if (current_cpu_data.cputype == CPU_R4400SC)
+       if (current_cpu_type() == CPU_R4400SC)
                *mbcs |= KN4K_MB_CSR_EE;
        fast_iob();
 }