diff --git a/[refs] b/[refs]
index d3e4858221e3..3dbb49ded18b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dfb8c35703709ca5e8f58e019d72383110999a7
+refs/heads/master: 3c9547a504a96a6a3585573dc172ab4070c18679
diff --git a/trunk/arch/cris/arch-v10/boot/compressed/Makefile b/trunk/arch/cris/arch-v10/boot/compressed/Makefile
index 17ba271b226e..4a031cb27eb9 100644
--- a/trunk/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/trunk/arch/cris/arch-v10/boot/compressed/Makefile
@@ -3,9 +3,9 @@
 #
 
 CC = gcc-cris -melf $(LINUXINCLUDE)
-EXTRA_CFLAGS = -O2
+ccflags-y += -O2
 LD = ld-cris
-LDFLAGS = -T $(obj)/decompress.ld
+ldflags-y += -T $(obj)/decompress.ld
 OBJECTS = $(obj)/head.o $(obj)/misc.o
 OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss