summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/Makefile
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-09-30 13:03:24 -0300
committerSascha Hauer <s.hauer@pengutronix.de>2011-10-04 10:08:06 +0200
commita6d3404891834ed3cd2c80d77d43094205d7390b (patch)
treeb9ca01086a1cdd186b2b9b27af9ed07c1f3d7856 /arch/arm/mach-mxs/Makefile
parent93ee7a9340d64f20295aacc3fb6a22b759323280 (diff)
downloadop-kernel-dev-a6d3404891834ed3cd2c80d77d43094205d7390b.zip
op-kernel-dev-a6d3404891834ed3cd2c80d77d43094205d7390b.tar.gz
ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file
Consolidate mm-mx23.c and mm-mx28.c into a single file. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
-rw-r--r--arch/arm/mach-mxs/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
index 6c38262..ea8dcb7 100644
--- a/arch/arm/mach-mxs/Makefile
+++ b/arch/arm/mach-mxs/Makefile
@@ -1,11 +1,11 @@
# Common support
-obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o
+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 mm-mx23.o
-obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.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
OpenPOWER on IntegriCloud