diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 15:17:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 15:17:14 +0200 |
| commit | 620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch) | |
| tree | b1a0411e2588953777d0b10245b12044c33cef54 /arch/arm/plat-mxc/Makefile | |
| parent | 04944b793e18ece23f63c0252646b310c1845940 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
| download | kernel-crypto-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.tar.gz kernel-crypto-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.tar.xz kernel-crypto-620f2efcdc5c7a2db68da41bc3df3cf9a718024e.zip | |
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
| -rw-r--r-- | arch/arm/plat-mxc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index db66e9ae841..067556f7c91 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -3,6 +3,6 @@ # # Common support -obj-y := irq.o clock.o gpio.o time.o +obj-y := irq.o clock.o gpio.o time.o devices.o -obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o +obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o |