git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
arch
/
sh
/
drivers
/
dma
/
dma-pvr2.c
diff --git
a/arch/sh/drivers/dma/dma-pvr2.c
b/arch/sh/drivers/dma/dma-pvr2.c
index
838fad5
..
391cbe1
100644
(file)
--- a/
arch/sh/drivers/dma/dma-pvr2.c
+++ b/
arch/sh/drivers/dma/dma-pvr2.c
@@
-13,8
+13,8
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/interrupt.h>
-#include <
asm/
mach/sysasic.h>
-#include <
asm/
mach/dma.h>
+#include <mach/sysasic.h>
+#include <mach/dma.h>
#include <asm/dma.h>
#include <asm/io.h>