summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/apic/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-17 23:12:48 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-17 23:12:48 +0100
commit9be1b56a3e718aa998772019c57c398dbb19e258 (patch)
tree3e05b04f1af12abeeecdd909a789610a58284178 /arch/x86/kernel/apic/Makefile
parent2a05180fe2e5b414f0cb2ccfc80e6c90563e3c67 (diff)
x86, apic: separate 32-bit setup functionality out of apic_32.c
Impact: build fix, cleanup A couple of arch setup callbacks were mistakenly in apic_32.c, breaking the build. Also simplify the code a bit. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/Makefile')
-rw-r--r--arch/x86/kernel/apic/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile
index 97f558db5c31..da7b7b9f8bd8 100644
--- a/arch/x86/kernel/apic/Makefile
+++ b/arch/x86/kernel/apic/Makefile
@@ -2,10 +2,9 @@
# Makefile for local APIC drivers and for the IO-APIC code
#
-obj-y := apic.o probe_$(BITS).o ipi.o nmi.o
+obj-$(CONFIG_X86_LOCAL_APIC) += apic.o probe_$(BITS).o ipi.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
obj-$(CONFIG_SMP) += ipi.o
-obj-$
ifeq ($(CONFIG_X86_64),y)
obj-y += apic_flat_64.o