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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
io_trapped.c
diff --git
a/arch/sh/kernel/io_trapped.c
b/arch/sh/kernel/io_trapped.c
index
c22853b
..
77dfecb
100644
(file)
--- a/
arch/sh/kernel/io_trapped.c
+++ b/
arch/sh/kernel/io_trapped.c
@@
-267,7
+267,7
@@
static struct mem_access trapped_io_access = {
int handle_trapped_io(struct pt_regs *regs, unsigned long address)
{
mm_segment_t oldfs;
-
opcod
e_t instruction;
+
insn_siz
e_t instruction;
int tmp;
if (!lookup_tiop(address))