summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-09 18:03:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-09 18:03:13 +0100
commit492c71dd545a54dc62df8780bd8d233d771748df (patch)
tree73960c90dd47938000478b9b3b1228a8c860e65b /drivers/dma
parentf0af7245f1725fdc39b32b59c20500448437ddbe (diff)
parent18365d181fe7fee8b52cd12482200d3a4c48d05e (diff)
downloadlinux-492c71dd545a54dc62df8780bd8d233d771748df.tar.bz2
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/mv_xor.c2
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);