Merge branches 'release' and 'wmi-2.6.25' into release

[linux-2.6] / arch / x86 / Makefile

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index e2ffccfd6af60c103b0c8c5996d4d94874f392fc..364865b1b08de8b54625efbf3acb4bb9dbe8089d 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -7,6 +7,8 @@ else
         KBUILD_DEFCONFIG := $(ARCH)_defconfig
 endif
 
+core-$(CONFIG_KVM) += arch/x86/kvm/
+
 # BITS is used as extension for files which are available in a 32 bit
 # and a 64 bit version to simplify shared Makefiles.
 # e.g.: obj-y += foo_$(BITS).o
@@ -90,7 +92,6 @@ KBUILD_AFLAGS += $(cfi) $(cfi-sigframe)
 KBUILD_CFLAGS += $(cfi) $(cfi-sigframe)
 
 LDFLAGS := -m elf_$(UTS_MACHINE)
-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
 
 # Speed up the build
 KBUILD_CFLAGS += -pipe
@@ -139,6 +140,11 @@ mflags-$(CONFIG_X86_ES7000)        := -Iinclude/asm-x86/mach-es7000
 fcore-$(CONFIG_X86_ES7000)     := arch/x86/mach-es7000/
 mcore-$(CONFIG_X86_ES7000)     := arch/x86/mach-default/
 
+# RDC R-321x subarch support
+mflags-$(CONFIG_X86_RDC321X)   := -Iinclude/asm-x86/mach-rdc321x
+mcore-$(CONFIG_X86_RDC321X)    := arch/x86/mach-default/
+core-$(CONFIG_X86_RDC321X)     += arch/x86/mach-rdc321x/
+
 # default subarch .h files
 mflags-y += -Iinclude/asm-x86/mach-default