x86, apic: move remaining APIC drivers to arch/x86/kernel/apic/*

Move the 32-bit extended-arch APIC drivers to arch/x86/kernel/apic/
too, and rename apic_64.c to probe_64.c.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 2 deletions

diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile
index da20b70c4000..97f558db5c31 100644
--- a/arch/x86/kernel/apic/Makefile
+++ b/arch/x86/kernel/apic/Makefile
@@ -2,14 +2,19 @@
 # Makefile for local APIC drivers and for the IO-APIC code
 #
 
-obj-y                           := apic.o ipi.o nmi.o
+obj-y                           := 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_64.o apic_flat_64.o
+obj-y                           += apic_flat_64.o
 obj-$(CONFIG_X86_X2APIC)        += x2apic_cluster.o
 obj-$(CONFIG_X86_X2APIC)        += x2apic_phys.o
 obj-$(CONFIG_X86_UV)            += x2apic_uv_x.o
 endif
 
+obj-$(CONFIG_X86_BIGSMP)        += bigsmp_32.o
+obj-$(CONFIG_X86_NUMAQ)         += numaq_32.o
+obj-$(CONFIG_X86_ES7000)        += es7000_32.o
+obj-$(CONFIG_X86_SUMMIT)        += summit_32.o