x86, apic: separate 32-bit setup functionality out of apic_32.c

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / Makefile

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 24f357e7557a186f750699965f39f8e22dce7140..de5657c039e90c99d6fc52e12f8e32e737744ed7 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -30,7 +30,7 @@ obj-y                 += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y                  += time_$(BITS).o ioport.o ldt.o dumpstack.o
 obj-y                  += setup.o i8259.o irqinit_$(BITS).o
 obj-$(CONFIG_X86_VISWS)        += visws_quirks.o
-obj-$(CONFIG_X86_32)   += probe_32.o probe_roms_32.o
+obj-$(CONFIG_X86_32)   += probe_roms_32.o
 obj-$(CONFIG_X86_32)   += sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)   += sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)   += syscall_64.o vsyscall_64.o
@@ -58,23 +58,18 @@ obj-$(CONFIG_PCI)           += early-quirks.o
 apm-y                          := apm_32.o
 obj-$(CONFIG_APM)              += apm.o
 obj-$(CONFIG_SMP)              += smp.o
-obj-$(CONFIG_SMP)              += smpboot.o tsc_sync.o ipi.o
+obj-$(CONFIG_SMP)              += smpboot.o tsc_sync.o
 obj-$(CONFIG_SMP)              += setup_percpu.o
 obj-$(CONFIG_X86_64_SMP)       += tsc_sync.o
 obj-$(CONFIG_X86_TRAMPOLINE)   += trampoline_$(BITS).o
 obj-$(CONFIG_X86_MPPARSE)      += mpparse.o
-obj-$(CONFIG_X86_LOCAL_APIC)   += apic.o nmi.o ipi.o
-obj-$(CONFIG_X86_IO_APIC)      += io_apic.o
+obj-y                          += apic/
 obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
 obj-$(CONFIG_DYNAMIC_FTRACE)   += ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)    += ftrace.o
 obj-$(CONFIG_KEXEC)            += machine_kexec_$(BITS).o
 obj-$(CONFIG_KEXEC)            += relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)       += crash_dump_$(BITS).o
-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
 obj-y                          += vsmp_64.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
 obj-$(CONFIG_MODULES)          += module_$(BITS).o
@@ -116,17 +111,13 @@ 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_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
-        obj-$(CONFIG_AUDIT)            += audit_64.o
-
-        obj-$(CONFIG_GART_IOMMU)       += pci-gart_64.o aperture_64.o
-        obj-$(CONFIG_CALGARY_IOMMU)    += pci-calgary_64.o tce_64.o
-        obj-$(CONFIG_AMD_IOMMU)                += amd_iommu_init.o amd_iommu.o
-
-        obj-$(CONFIG_PCI_MMCONFIG)     += mmconf-fam10h_64.o
+       obj-$(CONFIG_X86_UV)            += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o
+       obj-$(CONFIG_X86_PM_TIMER)      += pmtimer_64.o
+       obj-$(CONFIG_AUDIT)             += audit_64.o
+
+       obj-$(CONFIG_GART_IOMMU)        += pci-gart_64.o aperture_64.o
+       obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary_64.o tce_64.o
+       obj-$(CONFIG_AMD_IOMMU)         += amd_iommu_init.o amd_iommu.o
+
+       obj-$(CONFIG_PCI_MMCONFIG)      += mmconf-fam10h_64.o
 endif