diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
| commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
| tree | f59185b71c8059941de79143f71178453599b8f1 /arch/cris/arch-v32/mach-a3/dma.c | |
| parent | ftrace, kbuild: condense recordmcount.pl parameter code (diff) | |
| parent | Linux v2.6.28-rc3 (diff) | |
| download | linux-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.xz linux-36609469c8278554b046aa4cc9a5fa9ccea35306.zip | |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/cris/arch-v32/mach-a3/dma.c')
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-a3/dma.c b/arch/cris/arch-v32/mach-a3/dma.c index 25f236ef0b81..f35e4f65f4ef 100644 --- a/arch/cris/arch-v32/mach-a3/dma.c +++ b/arch/cris/arch-v32/mach-a3/dma.c @@ -2,7 +2,7 @@ #include <linux/kernel.h> #include <linux/spinlock.h> -#include <asm/arch/mach/dma.h> +#include <mach/dma.h> #include <hwregs/reg_map.h> #include <hwregs/reg_rdwr.h> #include <hwregs/marb_defs.h> |