Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / sh / oprofile / Makefile

diff --git a/arch/sh/oprofile/Makefile b/arch/sh/oprofile/Makefile
index 3d48f2721287ed6ee574482b88b115231e1451bd..8e6eec91c14c902a9a9bea438fee6ac2e6c7560c 100644 (file)
--- a/arch/sh/oprofile/Makefile
+++ b/arch/sh/oprofile/Makefile
@@ -6,11 +6,8 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
                oprofilefs.o oprofile_stats.o \
                timer_int.o )
 
-profdrvr-y                             := op_model_null.o
+oprofile-y     := $(DRIVER_OBJS) common.o backtrace.o
 
-# SH7750-style performance counters exist across 7750/7750S and 7091.
-profdrvr-$(CONFIG_CPU_SUBTYPE_SH7750S) := op_model_sh7750.o
-profdrvr-$(CONFIG_CPU_SUBTYPE_SH7750)  := op_model_sh7750.o
-profdrvr-$(CONFIG_CPU_SUBTYPE_SH7091)  := op_model_sh7750.o
-
-oprofile-y                             := $(DRIVER_OBJS) $(profdrvr-y)
+oprofile-$(CONFIG_CPU_SUBTYPE_SH7750S) += op_model_sh7750.o
+oprofile-$(CONFIG_CPU_SUBTYPE_SH7750)  += op_model_sh7750.o
+oprofile-$(CONFIG_CPU_SUBTYPE_SH7091)  += op_model_sh7750.o