[SCSI] Merge tag 'fcoe-02-19-13' into for-linus

[~andy/linux] / arch / mips / oprofile / common.c

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index f80480a5a0328b3a79d45950c2679577d0345e4a..e32db1ff02c7ee4020f7d5e1c199f966bfc585ed 100644 (file)
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -16,7 +16,6 @@
 #include "op_impl.h"
 
 extern struct op_mips_model op_model_mipsxx_ops __weak;
-extern struct op_mips_model op_model_rm9000_ops __weak;
 extern struct op_mips_model op_model_loongson2_ops __weak;
 
 static struct op_mips_model *model;
@@ -91,12 +90,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:
+       case CPU_XLR:
                lmodel = &op_model_mipsxx_ops;
                break;
 
-       case CPU_RM9000:
-               lmodel = &op_model_rm9000_ops;
-               break;
        case CPU_LOONGSON2:
                lmodel = &op_model_loongson2_ops;
                break;