Merge branch 'patchwork' into v4l_for_linus

[karo-tx-linux.git] / arch / mips / oprofile / op_model_mipsxx.c

diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 4d94d75ec6f98f47351afd695202be986355ba24..42821ae2d77e586155eb2554232af87481423731 100644 (file)
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -372,6 +372,7 @@ static int __init mipsxx_init(void)
                op_model_mipsxx_ops.cpu_type = "mips/34K";
                break;
 
+       case CPU_1074K:
        case CPU_74K:
                op_model_mipsxx_ops.cpu_type = "mips/74K";
                break;
@@ -384,6 +385,14 @@ static int __init mipsxx_init(void)
                op_model_mipsxx_ops.cpu_type = "mips/proAptiv";
                break;
 
+       case CPU_P5600:
+               op_model_mipsxx_ops.cpu_type = "mips/P5600";
+               break;
+
+       case CPU_M5150:
+               op_model_mipsxx_ops.cpu_type = "mips/M5150";
+               break;
+
        case CPU_5KC:
                op_model_mipsxx_ops.cpu_type = "mips/5K";
                break;