diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/s390/kernel/sclp.S | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/s390/kernel/sclp.S')
| -rw-r--r-- | arch/s390/kernel/sclp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/sclp.S b/arch/s390/kernel/sclp.S index 27af3bf3a009..2e82fdd89320 100644 --- a/arch/s390/kernel/sclp.S +++ b/arch/s390/kernel/sclp.S | |||
| @@ -235,7 +235,7 @@ _sclp_print: | |||
| 235 | lh %r9,0(%r8) # update sccb length | 235 | lh %r9,0(%r8) # update sccb length |
| 236 | ar %r9,%r6 | 236 | ar %r9,%r6 |
| 237 | sth %r9,0(%r8) | 237 | sth %r9,0(%r8) |
| 238 | ar %r7,%r6 # update current mto adress | 238 | ar %r7,%r6 # update current mto address |
| 239 | ltr %r0,%r0 # more characters? | 239 | ltr %r0,%r0 # more characters? |
| 240 | jnz .LinitmtoS4 | 240 | jnz .LinitmtoS4 |
| 241 | l %r2,.LwritedataS4-.LbaseS4(%r13)# write data | 241 | l %r2,.LwritedataS4-.LbaseS4(%r13)# write data |