diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /arch/sh/lib | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/sh/lib')
| -rw-r--r-- | arch/sh/lib/strlen.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/lib/strlen.S b/arch/sh/lib/strlen.S index f8ab296047b3..1bcc13f05962 100644 --- a/arch/sh/lib/strlen.S +++ b/arch/sh/lib/strlen.S | |||
| @@ -35,7 +35,7 @@ ENTRY(strlen) | |||
| 35 | mov.b @r4+,r1 | 35 | mov.b @r4+,r1 |
| 36 | tst r1,r1 | 36 | tst r1,r1 |
| 37 | bt 8f | 37 | bt 8f |
| 38 | add #1,r2 | 38 | add #1,r2 |
| 39 | 39 | ||
| 40 | 1: | 40 | 1: |
| 41 | mov #0,r3 | 41 | mov #0,r3 |