diff --git a/[refs] b/[refs]
index 3dbb49ded18b..82936e2ed9fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c9547a504a96a6a3585573dc172ab4070c18679
+refs/heads/master: 546cc14862c8712341823c9235268062bac87b74
diff --git a/trunk/arch/cris/arch-v10/boot/rescue/Makefile b/trunk/arch/cris/arch-v10/boot/rescue/Makefile
index 911c89456f8d..2e5045b9e19c 100644
--- a/trunk/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/trunk/arch/cris/arch-v10/boot/rescue/Makefile
@@ -3,10 +3,10 @@
 #
 
 CC = gcc-cris -mlinux $(LINUXINCLUDE)
-EXTRA_CFLAGS = -O2
-AFLAGS = -traditional
+ccflags-y += -O2
+asflags-y += -traditional
 LD = gcc-cris -mlinux -nostdlib
-LDFLAGS = -T $(obj)/rescue.ld
+ldflags-y += -T $(obj)/rescue.ld
 OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o