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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4a
/
setup-sh7780.c
diff --git
a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index
b12f537
..
0f41486
100644
(file)
--- a/
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@
-12,10
+12,9
@@
#include <linux/serial.h>
#include <linux/io.h>
#include <linux/serial_sci.h>
+#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <asm/dmaengine.h>
-
#include <cpu/dma-register.h>
static struct plat_sci_port scif0_platform_data = {