diff --git a/[refs] b/[refs] index 3ceb1195b189..d0beb002cf12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cb41c65b3fc547da4050721445d07277768aa37 +refs/heads/master: 09cfd929860532f95c9944d39abbb043b8082f36 diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile index 116b03a45636..7aa1dc6d67c8 100644 --- a/trunk/arch/x86/Makefile +++ b/trunk/arch/x86/Makefile @@ -11,10 +11,9 @@ endif $(srctree)/arch/x86/Makefile%: ; ifeq ($(CONFIG_X86_32),y) + UTS_MACHINE := i386 include $(srctree)/arch/x86/Makefile_32 else + UTS_MACHINE := x86_64 include $(srctree)/arch/x86/Makefile_64 endif - - -