projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cputime' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[linux-2.6]
/
arch
/
arm
/
plat-mxc
/
Makefile
diff --git
a/arch/arm/plat-mxc/Makefile
b/arch/arm/plat-mxc/Makefile
index
067556f
..
db74a92
100644
(file)
--- a/
arch/arm/plat-mxc/Makefile
+++ b/
arch/arm/plat-mxc/Makefile
@@
-5,4
+5,5
@@
# Common support
obj-y := irq.o clock.o gpio.o time.o devices.o
+obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o
obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o