diff options
| author | Tony Lindgren | 2010-12-22 01:48:20 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2010-12-22 01:48:20 +0100 |
| commit | 6971071cdda79cad5f53ba390e466d696e7e9006 (patch) | |
| tree | afa3f33334ac8115caa05a53addea137bcbe9164 /arch/arm/mach-omap2/Makefile | |
| parent | Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus (diff) | |
| parent | OMAP: DMA: Convert DMA library into platform driver (diff) | |
| download | kernel-qcow2-linux-6971071cdda79cad5f53ba390e466d696e7e9006.tar.gz kernel-qcow2-linux-6971071cdda79cad5f53ba390e466d696e7e9006.tar.xz kernel-qcow2-linux-6971071cdda79cad5f53ba390e466d696e7e9006.zip | |
Merge branch 'devel-dma' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b86b06292388..cdfb5faaec9d 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ - common.o gpio.o + common.o gpio.o dma.o omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o hwmod-common = omap_hwmod.o \ |