From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 21:01:04 +0000 (+0200)
Subject: Merge branch 'x86/uv' into x86/x2apic
X-Git-Tag: v2.6.28-rc1~699^2^8~23^2~9^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9553e11325e3d44a8c8a1428c7e5f146f1cc7238;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/uv' into x86/x2apic

Conflicts:

	arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

9553e11325e3d44a8c8a1428c7e5f146f1cc7238
diff --cc arch/x86/kernel/Makefile
index 673f1d12b42,b78a17b1281..ea000467553
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -102,8 -102,7 +102,9 @@@ obj-$(CONFIG_OLPC)		+= olpc.
  # 64 bit specific files
  ifeq ($(CONFIG_X86_64),y)
          obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
+ 	obj-y				+= bios_uv.o
 +        obj-y				+= genx2apic_cluster.o
 +        obj-y				+= genx2apic_phys.o
          obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
          obj-$(CONFIG_AUDIT)		+= audit_64.o