dirty fix to merging

1 files changed, 18 insertions, 0 deletions

diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
new file mode 100644
index 00000000..908bf9a5
--- /dev/null
+++ b/arch/arm/mach-mxs/Makefile
@@ -0,0 +1,18 @@
+# Common support
+obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o mm.o
+
+obj-$(CONFIG_MXS_OCOTP) += ocotp.o
+obj-$(CONFIG_PM) += pm.o
+
+obj-$(CONFIG_SOC_IMX23) += clock-mx23.o
+obj-$(CONFIG_SOC_IMX28) += clock-mx28.o
+
+obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
+obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o
+obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
+obj-$(CONFIG_MACH_M28EVK)    += mach-m28evk.o
+obj-$(CONFIG_MACH_APX4DEVKIT) += mach-apx4devkit.o
+obj-$(CONFIG_MODULE_TX28) += module-tx28.o
+obj-$(CONFIG_MACH_TX28)    += mach-tx28.o
+
+obj-y += devices/