Merge ../linus

[powerpc.git] / arch / arm / mach-iop32x / Makefile

diff --git a/arch/arm/mach-iop32x/Makefile b/arch/arm/mach-iop32x/Makefile
index ef561db..7b05b37 100644 (file)
--- a/arch/arm/mach-iop32x/Makefile
+++ b/arch/arm/mach-iop32x/Makefile
@@ -2,10 +2,12 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                  := common.o setup.o irq.o
+obj-y                  := irq.o
 obj-m                  :=
 obj-n                  :=
 obj-                   :=
 
-obj-$(CONFIG_ARCH_IQ80321) += iq80321-mm.o iq80321-pci.o
-obj-$(CONFIG_ARCH_IQ31244) += iq31244-mm.o iq31244-pci.o
+obj-$(CONFIG_MACH_GLANTANK) += glantank.o
+obj-$(CONFIG_ARCH_IQ80321) += iq80321.o
+obj-$(CONFIG_ARCH_IQ31244) += iq31244.o
+obj-$(CONFIG_MACH_N2100) += n2100.o