Merge branch 'devel' into next

[pandora-kernel.git] / arch / arm / mach-orion5x / Makefile

diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile
index 9301bf5..fcc48a8 100644 (file)
--- a/arch/arm/mach-orion5x/Makefile
+++ b/arch/arm/mach-orion5x/Makefile
@@ -1,7 +1,15 @@
-obj-y                          += common.o addr-map.o pci.o gpio.o irq.o
+obj-y                          += common.o addr-map.o pci.o gpio.o irq.o mpp.o
 obj-$(CONFIG_MACH_DB88F5281)   += db88f5281-setup.o
 obj-$(CONFIG_MACH_RD88F5182)   += rd88f5182-setup.o
 obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o
 obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o
 obj-$(CONFIG_MACH_DNS323)      += dns323-setup.o
-obj-$(CONFIG_MACH_TS209)       += ts209-setup.o
+obj-$(CONFIG_MACH_TS209)       += ts209-setup.o tsx09-common.o
+obj-$(CONFIG_MACH_TS409)       += ts409-setup.o tsx09-common.o
+obj-$(CONFIG_MACH_WRT350N_V2)  += wrt350n-v2-setup.o
+obj-$(CONFIG_MACH_TS78XX)      += ts78xx-setup.o
+obj-$(CONFIG_MACH_MV2120)      += mv2120-setup.o
+obj-$(CONFIG_MACH_MSS2)                += mss2-setup.o
+obj-$(CONFIG_MACH_WNR854T)     += wnr854t-setup.o
+obj-$(CONFIG_MACH_RD88F5181L_GE)       += rd88f5181l-ge-setup.o
+obj-$(CONFIG_MACH_RD88F5181L_FXO)      += rd88f5181l-fxo-setup.o