summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2/Makefile
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-12-09 19:01:03 +1100
committerJames Morris <jmorris@namei.org>2009-12-09 19:01:03 +1100
commit1ad1f10cd915744bbe52b19423653b38287d827d (patch)
treeae072aace36b45a55d80b8cbf1b6d92523a88ea0 /arch/arm/mach-mx2/Makefile
parent08e3daff217059c84c360cc71212686e0a7995af (diff)
parent2b876f95d03e226394b5d360c86127cbefaf614b (diff)
downloadop-kernel-dev-1ad1f10cd915744bbe52b19423653b38287d827d.zip
op-kernel-dev-1ad1f10cd915744bbe52b19423653b38287d827d.tar.gz
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-mx2/Makefile')
-rw-r--r--arch/arm/mach-mx2/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile
index 19560f0..52aca0aa 100644
--- a/arch/arm/mach-mx2/Makefile
+++ b/arch/arm/mach-mx2/Makefile
@@ -20,4 +20,5 @@ obj-$(CONFIG_MACH_MX27LITE) += mx27lite.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX27) += eukrea_cpuimx27.o
obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
obj-$(CONFIG_MACH_PCA100) += pca100.o
+obj-$(CONFIG_MACH_MXT_TD60) += mxt_td60.o
OpenPOWER on IntegriCloud