diff options
author | 2009-02-16 17:29:58 -0800 | |
---|---|---|
committer | 2009-02-17 12:22:20 +0100 | |
commit | 06cd9a7dc8a58186060a91b6ddc031057435fd34 (patch) | |
tree | cc015c3a966f31ef77cb458e0b480ffc0eb12acd /arch/x86/kernel/Makefile | |
parent | Merge branch 'x86/headers' into x86/core (diff) | |
download | linux-06cd9a7dc8a58186060a91b6ddc031057435fd34.tar.gz linux-06cd9a7dc8a58186060a91b6ddc031057435fd34.tar.bz2 linux-06cd9a7dc8a58186060a91b6ddc031057435fd34.zip |
x86: add x2apic config
Impact: cleanup
so could deselect x2apic
and INTR_REMAP will select x2apic
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r-- | arch/x86/kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 24f357e7557a..1cefd218f764 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -117,8 +117,8 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o # NB rename without _64 # 64 bit specific files ifeq ($(CONFIG_X86_64),y) obj-y += genapic_64.o genapic_flat_64.o - obj-y += genx2apic_cluster.o - obj-y += genx2apic_phys.o + obj-$(CONFIG_X86_X2APIC) += genx2apic_cluster.o + obj-$(CONFIG_X86_X2APIC) += genx2apic_phys.o obj-$(CONFIG_X86_UV) += genx2apic_uv_x.o tlb_uv.o obj-$(CONFIG_X86_UV) += bios_uv.o uv_irq.o uv_sysfs.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o |