summaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/dma.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 10:02:51 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 10:02:51 +1100
commit03041e1f99d03c8076ca3acf5db3e912366f136b (patch)
tree9dbad0c81ddcce37ce1315a529acee72c88a1e1d /arch/arm/plat-omap/dma.c
parent0f58659760315f5b94e3c66f952531119ebd4038 (diff)
parent393c1ee73f6360581ba21fe167e24ae80ded514b (diff)
Merge commit 'arm/devel'
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r--arch/arm/plat-omap/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 50f8b4ad9a09..7686b9fa53f2 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -29,7 +29,7 @@
#include <asm/system.h>
#include <mach/hardware.h>
-#include <asm/dma.h>
+#include <mach/dma.h>
#include <mach/tc.h>