diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:24:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:24:13 +0200 |
| commit | e3ae0acf59244ecf5b023ec99cef4b6b29d649bc (patch) | |
| tree | 02a8bfdcab61677430ecfe04e9e44e1007c35f0e /arch/x86/kernel/Makefile | |
| parent | 4b62ac9a2b859f932afd5625362c927111b7dd9b (diff) | |
| parent | e7eb8726d0e144f0925972c4ecee945e91a42753 (diff) | |
| download | linux-e3ae0acf59244ecf5b023ec99cef4b6b29d649bc.tar.gz linux-e3ae0acf59244ecf5b023ec99cef4b6b29d649bc.tar.bz2 linux-e3ae0acf59244ecf5b023ec99cef4b6b29d649bc.zip | |
Merge branch 'x86/uv' into x86/devel
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 8ef4dbf32cf9..9a71be827927 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -93,7 +93,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 + obj-y += genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_AUDIT) += audit_64.o |