Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[~andy/linux] / arch / um / Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 133f7de2a13d5ade42c217c56c74604ae6a39a58..48d92bbe62e9eae2460df5fb99bdd83974b9aecb 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -6,6 +6,17 @@
 # Licensed under the GPL
 #
 
+# select defconfig based on actual architecture
+ifeq ($(SUBARCH),x86)
+  ifeq ($(shell uname -m),x86_64)
+        KBUILD_DEFCONFIG := x86_64_defconfig
+  else
+        KBUILD_DEFCONFIG := i386_defconfig
+  endif
+else
+        KBUILD_DEFCONFIG := $(SUBARCH)_defconfig
+endif
+
 ARCH_DIR := arch/um
 OS := $(shell uname -s)
 # We require bash because the vmlinux link and loader script cpp use bash