diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 08:44:00 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 08:44:00 -0500 |
commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /arch/arm/lib | |
parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
download | talos-obmc-linux-d039ba24f135147f60a13bcaa768189a5b773b6e.tar.gz talos-obmc-linux-d039ba24f135147f60a13bcaa768189a5b773b6e.zip |
Merge with /home/shaggy/git/linus-clean/
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) subs r2, r2, #2 orr ip, ip, r3, push_hbyte1 strh ip, [r0] - bpl 2b + bpl 1b -3: tst r2, #1 -2: movne ip, r3, lsr #8 + tst r2, #1 +3: movne ip, r3, lsr #8 strneh ip, [r0] mov pc, lr |