diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/arm/lib | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/io-writesw-armv4.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S index 6d1d7c27806e..5e240e452af6 100644 --- a/arch/arm/lib/io-writesw-armv4.S +++ b/arch/arm/lib/io-writesw-armv4.S | |||
| @@ -87,9 +87,9 @@ ENTRY(__raw_writesw) | |||
| 87 | subs r2, r2, #2 | 87 | subs r2, r2, #2 |
| 88 | orr ip, ip, r3, push_hbyte1 | 88 | orr ip, ip, r3, push_hbyte1 |
| 89 | strh ip, [r0] | 89 | strh ip, [r0] |
| 90 | bpl 2b | 90 | bpl 1b |
| 91 | 91 | ||
| 92 | 3: tst r2, #1 | 92 | tst r2, #1 |
| 93 | 2: movne ip, r3, lsr #8 | 93 | 3: movne ip, r3, lsr #8 |
| 94 | strneh ip, [r0] | 94 | strneh ip, [r0] |
| 95 | mov pc, lr | 95 | mov pc, lr |