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 with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
mips-boards
/
sim
/
sim_irq.S
diff --git
a/arch/mips/mips-boards/sim/sim_irq.S
b/arch/mips/mips-boards/sim/sim_irq.S
index 835f0387fcd4b1467ff934b358b21873b7d2c0ff..da52297a221635b839b9537c8ef6a5ad4c8d70c6 100644
(file)
--- a/
arch/mips/mips-boards/sim/sim_irq.S
+++ b/
arch/mips/mips-boards/sim/sim_irq.S
@@
-42,7
+42,7
@@
and s0, s1
#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
- .set mips32
+ .set mips32
clz a0, s0
.set mips0
negu a0