summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx2/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-09 01:29:27 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-09 01:29:27 (GMT)
commitd585a021c0b10b0477d6b608c53e1feb8cde0507 (patch)
tree5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/mach-mx2/Makefile
parent84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff)
parent091bf7624d1c90cec9e578a18529f615213ff847 (diff)
downloadlinux-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.xz
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/mach-mx2/Makefile')
-rw-r--r--arch/arm/mach-mx2/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile
index 382d860..950649a 100644
--- a/arch/arm/mach-mx2/Makefile
+++ b/arch/arm/mach-mx2/Makefile
@@ -4,7 +4,9 @@
# Object file lists.
-obj-y := system.o generic.o devices.o serial.o
+obj-y := generic.o devices.o serial.o
+
+obj-$(CONFIG_MACH_MX21) += clock_imx21.o
obj-$(CONFIG_MACH_MX27) += cpu_imx27.o
obj-$(CONFIG_MACH_MX27) += clock_imx27.o