diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /arch/arm/lib | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index 5382a3023602..2036ff15bda9 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 1: ldrexb r2, [r1] | 7 | 1: ldrexb r2, [r1] |
| 8 | \instr r2, r2, r3 | 8 | \instr r2, r2, r3 |
| 9 | strexb r0, r2, [r1] | 9 | strexb r0, r2, [r1] |
| 10 | cmpne r0, #0 | 10 | cmp r0, #0 |
| 11 | bne 1b | 11 | bne 1b |
| 12 | mov pc, lr | 12 | mov pc, lr |
| 13 | .endm | 13 | .endm |