1 files changed, 4 insertions, 9 deletions

diff --git a/arch/sh/oprofile/Makefile b/arch/sh/oprofile/Makefile
index 2efc2e79fd29..8e6eec91c14c 100644
--- a/arch/sh/oprofile/Makefile
+++ b/arch/sh/oprofile/Makefile
@@ -6,13 +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)
-
-EXTRA_CFLAGS += -Werror
+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