git.samba.org
/
sfrench
/
cifs-2.6.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/jikos/hid
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
boards
/
mach-r2d
/
setup.c
diff --git
a/arch/sh/boards/mach-r2d/setup.c
b/arch/sh/boards/mach-r2d/setup.c
index 2308e8753bcdee2bcb66f49ab2bfecd207a5b9e1..c585be00956ea9a8d541656081ac80a2f86ae3f4 100644
(file)
--- a/
arch/sh/boards/mach-r2d/setup.c
+++ b/
arch/sh/boards/mach-r2d/setup.c
@@
-18,7
+18,7
@@
#include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h>
#include <asm/machvec.h>
-#include <
asm/rts7751
r2d.h>
+#include <
mach/
r2d.h>
#include <asm/io.h>
#include <asm/io_trapped.h>
#include <asm/spi.h>