diff --git a/[refs] b/[refs]
index 3859e0f44319..24b12467905e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b041227f7ef7c7e97f205c68c6069c0c62e5204
+refs/heads/master: 4bc3e7192cf9a47d9864c4e8259859be55a480b3
diff --git a/trunk/arch/sh/oprofile/Makefile b/trunk/arch/sh/oprofile/Makefile
index 2efc2e79fd29..3d48f2721287 100644
--- a/trunk/arch/sh/oprofile/Makefile
+++ b/trunk/arch/sh/oprofile/Makefile
@@ -14,5 +14,3 @@ 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