projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux
[cascardo/linux.git]
/
arch
/
arm
/
mach-footbridge
/
dma.c
diff --git
a/arch/arm/mach-footbridge/dma.c
b/arch/arm/mach-footbridge/dma.c
index
e2e0df8
..
22536b8
100644
(file)
--- a/
arch/arm/mach-footbridge/dma.c
+++ b/
arch/arm/mach-footbridge/dma.c
@@
-13,9
+13,9
@@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/spinlock.h>
+#include <linux/scatterlist.h>
#include <asm/dma.h>
-#include <asm/scatterlist.h>
#include <asm/mach/dma.h>
#include <asm/hardware/dec21285.h>