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 'misc/mtd/sharpsl-nand' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
arch-v32
/
mach-fs
/
io.c
diff --git
a/arch/cris/arch-v32/mach-fs/io.c
b/arch/cris/arch-v32/mach-fs/io.c
index a03a3ad3a188fa191e7bb494017dfd8fbb0ea741..cb6327b1f8f826051a4ad975aa324d564b602500 100644
(file)
--- a/
arch/cris/arch-v32/mach-fs/io.c
+++ b/
arch/cris/arch-v32/mach-fs/io.c
@@
-12,8
+12,8
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <asm/io.h>
-#include <
asm/ar
ch/pinmux.h>
-#include <
asm/arch/
hwregs/gio_defs.h>
+#include <
ma
ch/pinmux.h>
+#include <hwregs/gio_defs.h>
#ifndef DEBUG
#define DEBUG(x)