diff --git a/[refs] b/[refs]
index 3225f4b2091b..7b398f6715d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59968d3bb927f54db660e7cd4de389ebc292eec0
+refs/heads/master: 2da0ba2d2768baa0c5c502d1f53505dc905a06e3
diff --git a/trunk/arch/mips/cavium-octeon/Makefile b/trunk/arch/mips/cavium-octeon/Makefile
index 1c2a7faf5881..d6903c3f3d51 100644
--- a/trunk/arch/mips/cavium-octeon/Makefile
+++ b/trunk/arch/mips/cavium-octeon/Makefile
@@ -14,3 +14,5 @@ obj-y += dma-octeon.o flash_setup.o
 obj-y += octeon-memcpy.o
 
 obj-$(CONFIG_SMP)                     += smp.o
+
+EXTRA_CFLAGS += -Werror