Merge omap-drivers

[linux-2.6-omap-h63xx.git] / arch / arm / oprofile / op_arm_model.h

diff --git a/arch/arm/oprofile/op_arm_model.h b/arch/arm/oprofile/op_arm_model.h
index b45efa5299453f904fabf91885d8829a90b4178e..4899c629aa03473fe4a7d7fe1ad67b77b15ce9d2 100644 (file)
--- a/arch/arm/oprofile/op_arm_model.h
+++ b/arch/arm/oprofile/op_arm_model.h
@@ -24,9 +24,8 @@ struct op_arm_model_spec {
 extern struct op_arm_model_spec op_xscale_spec;
 #endif
 
-#ifdef CONFIG_CPU_V6
-extern struct op_arm_model_spec op_arm11_spec;
-#endif
+extern struct op_arm_model_spec op_armv6_spec;
+extern struct op_arm_model_spec op_mpcore_spec;
 
 extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth);