Merge branch 'linus' into x86/quirks

[deliverable/linux.git] / arch / m32r / Makefile

diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile
index c80618ab60ea82bb480441a30ab0d570dd561580..469766b24e2286ca3495b39a9dbf194dd83ca423 100644 (file)
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
@@ -5,6 +5,8 @@
 # architecture-specific flags and dependencies.
 #
 
+KBUILD_DEFCONFIG := m32700ut.smp_defconfig
+
 LDFLAGS                :=
 OBJCOPYFLAGS   := -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux        :=
@@ -25,7 +27,7 @@ cflags-$(CONFIG_ISA_M32R)     += -DNO_FPU
 aflags-$(CONFIG_ISA_M32R)      += -DNO_FPU -O2 -Wa,-no-bitinst
 
 KBUILD_CFLAGS += $(cflags-y)
-AFLAGS += $(aflags-y)
+KBUILD_AFLAGS += $(aflags-y)
 
 CHECKFLAGS     += -D__m32r__ -D__BIG_ENDIAN__=1