Merge omap-drivers

[linux-2.6-omap-h63xx.git] / arch / arm / oprofile / common.c

diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index f4661725b48d787169fcefcdde552f576e28c56a..6f833358cd0612c4c13e5d59619e86ccee2749e5 100644 (file)
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -135,10 +135,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        spec = &op_xscale_spec;
 #endif
 
-#ifdef CONFIG_CPU_V6
-       spec = &op_arm11_spec;
-#endif
-
        if (spec) {
                ret = spec->init();
                if (ret < 0)