Merge branch 'linus' into x86/x2apic

[sfrench/cifs-2.6.git] / arch / arm / mach-integrator / Makefile

diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile
index ebb255bdce8aa7ed6c85f25b95a639e30b6e551c..6a5ef8d30b105bfe9457f7d2cf93d3afd2db1ce0 100644 (file)
--- a/arch/arm/mach-integrator/Makefile
+++ b/arch/arm/mach-integrator/Makefile
@@ -4,7 +4,7 @@
 
 # Object file lists.
 
-obj-y                                  := clock.o core.o lm.o time.o
+obj-y                                  := clock.o core.o lm.o
 obj-$(CONFIG_ARCH_INTEGRATOR_AP)       += integrator_ap.o
 obj-$(CONFIG_ARCH_INTEGRATOR_CP)       += integrator_cp.o
 
@@ -12,4 +12,3 @@ obj-$(CONFIG_LEDS)                    += leds.o
 obj-$(CONFIG_PCI)                      += pci_v3.o pci.o
 obj-$(CONFIG_CPU_FREQ_INTEGRATOR)      += cpu.o
 obj-$(CONFIG_INTEGRATOR_IMPD1)         += impd1.o
-obj-$(CONFIG_SMP)                      += platsmp.o headsmp.o