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 branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
syscall.S
diff --git
a/arch/parisc/kernel/syscall.S
b/arch/parisc/kernel/syscall.S
index
68e75ce
..
82a52b2
100644
(file)
--- a/
arch/parisc/kernel/syscall.S
+++ b/
arch/parisc/kernel/syscall.S
@@
-605,7
+605,7
@@
cas_action:
copy %r0, %r21
3:
- /* Error occured on load or store */
+ /* Error occur
r
ed on load or store */
/* Free lock */
stw %r20, 0(%sr2,%r20)
#if ENABLE_LWS_DEBUG