diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 21:01:04 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 21:01:04 (GMT) |
commit | 9553e11325e3d44a8c8a1428c7e5f146f1cc7238 (patch) | |
tree | 98a95631f6b810436eca57c242ade769906200fa /arch/x86/kernel/Makefile | |
parent | 453c1404c5273a30d715e5a83372a78cff70b6d9 (diff) | |
parent | 7019cc2dd6fafcdc6b104005482dc910dcdbb797 (diff) | |
download | linux-fsl-qoriq-9553e11325e3d44a8c8a1428c7e5f146f1cc7238.tar.xz |
Merge branch 'x86/uv' into x86/x2apic
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 673f1d1..ea00046 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -102,6 +102,7 @@ obj-$(CONFIG_OLPC) += olpc.o # 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 |