summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/Makefile
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 10:52:29 +0200
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 10:52:29 +0200
commit7f11d8a5efd625ffa41cde1d8472f85e885478ec (patch)
tree4f80219fc2153166c89c54d6555498155fa2f3b2 /arch/x86_64/kernel/Makefile
parent5ba5891d44a6acade44887a0f3195489d46c12de (diff)
downloadblackbird-op-linux-7f11d8a5efd625ffa41cde1d8472f85e885478ec.tar.gz
blackbird-op-linux-7f11d8a5efd625ffa41cde1d8472f85e885478ec.zip
[PATCH] Remove all ifdefs for local/io apic
IO-APIC or local APIC can only be disabled at runtime anyways and Kconfig has forced these options on for a long time now. The Kconfigs are kept only now for the benefit of the shared acpi boot.c code. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/Makefile')
-rw-r--r--arch/x86_64/kernel/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index b5aaeafc1cd3..0ef39553c0f6 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -20,8 +20,8 @@ obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
-obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
-obj-$(CONFIG_X86_IO_APIC) += io_apic.o mpparse.o \
+obj-y += apic.o nmi.o
+obj-y += io_apic.o mpparse.o \
genapic.o genapic_cluster.o genapic_flat.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
OpenPOWER on IntegriCloud