Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / arch / arm / mach-iop33x / Makefile

diff --git a/arch/arm/mach-iop33x/Makefile b/arch/arm/mach-iop33x/Makefile
index f825cee57d9fbba9de4b9cea61585b10b1316099..90081d8c9d16c862da18602d851d7aa92cbea5e5 100644 (file)
--- a/arch/arm/mach-iop33x/Makefile
+++ b/arch/arm/mach-iop33x/Makefile
@@ -2,10 +2,10 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                  := setup.o irq.o
+obj-y                  := irq.o uart.o
 obj-m                  :=
 obj-n                  :=
 obj-                   :=
 
-obj-$(CONFIG_ARCH_IQ80331) += iq80331-pci.o
-obj-$(CONFIG_MACH_IQ80332) += iq80332-pci.o
+obj-$(CONFIG_ARCH_IQ80331) += iq80331.o
+obj-$(CONFIG_MACH_IQ80332) += iq80332.o