diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 08:53:52 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 08:53:52 +0000 |
commit | f430ce6ec4c8071d358e56d531ad77bdb5cf1820 (patch) | |
tree | 94e2d6b4d84148b7b118dfedebbbd6728dfa5547 /arch/cris/arch-v32/mach-a3/dma.c | |
parent | 2c68bcc9ffc5de11493f99e0ea891003f9c0a835 (diff) | |
parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
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 25f236ef0b8..f35e4f65f4e 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> |