git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx2
/
Makefile
diff --git
a/arch/arm/mach-mx2/Makefile
b/arch/arm/mach-mx2/Makefile
index
382d860
..
950649a
100644
(file)
--- 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