diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 19:03:13 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 19:03:13 +0200 |
commit | 492c71dd545a54dc62df8780bd8d233d771748df (patch) | |
tree | 73960c90dd47938000478b9b3b1228a8c860e65b /drivers/dma | |
parent | Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
parent | [ARM] Kirkwood: instantiate the orion_spi driver in the platform code (diff) | |
download | linux-492c71dd545a54dc62df8780bd8d233d771748df.tar.xz linux-492c71dd545a54dc62df8780bd8d233d771748df.zip |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/mv_xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index a4e4494663bf..0328da020a10 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -25,7 +25,7 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/memory.h> -#include <asm/plat-orion/mv_xor.h> +#include <plat/mv_xor.h> #include "mv_xor.h" static void mv_xor_issue_pending(struct dma_chan *chan); |