diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-21 19:48:20 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-21 19:48:20 -0500 |
| commit | 6971071cdda79cad5f53ba390e466d696e7e9006 (patch) | |
| tree | afa3f33334ac8115caa05a53addea137bcbe9164 /arch/arm/mach-omap2/Makefile | |
| parent | 4584acc3ee236424b5d0b52f143d980cae3c2be5 (diff) | |
| parent | f31cc9622d75c1c6f041d786698daa425c0425c2 (diff) | |
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 @@ | |||
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ | 6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ |
| 7 | common.o gpio.o | 7 | common.o gpio.o dma.o |
| 8 | 8 | ||
| 9 | omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o | 9 | omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o |
| 10 | hwmod-common = omap_hwmod.o \ | 10 | hwmod-common = omap_hwmod.o \ |