Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-2.6] / arch / x86 / Makefile
1 # Unified Makefile for i386 and x86_64
2
3 # select defconfig based on actual architecture
4 ifeq ($(ARCH),x86)
5         KBUILD_DEFCONFIG := i386_defconfig
6 else
7         KBUILD_DEFCONFIG := $(ARCH)_defconfig
8 endif
9
10 # No need to remake these files
11 $(srctree)/arch/x86/Makefile%: ;
12
13 ifeq ($(CONFIG_X86_32),y)
14         UTS_MACHINE := i386
15         include $(srctree)/arch/x86/Makefile_32
16 else
17         UTS_MACHINE := x86_64
18         include $(srctree)/arch/x86/Makefile_64
19 endif