Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / mips / oprofile / common.c

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index dd2cc42f1b6dc5931638843c45b26f7728f5fa39..53f9889b30eda3c278cf4664e463a793e36e9948 100644 (file)
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -75,7 +75,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        int res;
 
        switch (current_cpu_data.cputype) {
+       case CPU_5KC:
+       case CPU_20KC:
        case CPU_24K:
+       case CPU_25KF:
                lmodel = &op_model_mipsxx;
                break;