diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 22:00:49 +0000 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 22:00:49 +0000 |
commit | a4581b35e1bc80becf240238bc787a5ec2727db0 (patch) | |
tree | 34cbf36101639403a766e74deb36e7015d871b39 /arch/arm/lib/setbit.S | |
parent | f940b88d3a57594289455ea99a93a8ddc5c4af06 (diff) | |
parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
download | blackbird-op-linux-a4581b35e1bc80becf240238bc787a5ec2727db0.tar.gz blackbird-op-linux-a4581b35e1bc80becf240238bc787a5ec2727db0.zip |
Merge commit 'v3.2-rc6' into fbdev-next
Diffstat (limited to 'arch/arm/lib/setbit.S')
-rw-r--r-- | arch/arm/lib/setbit.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/lib/setbit.S b/arch/arm/lib/setbit.S index bbee5c66a23e..618fedae4b37 100644 --- a/arch/arm/lib/setbit.S +++ b/arch/arm/lib/setbit.S @@ -12,6 +12,4 @@ #include "bitops.h" .text -ENTRY(_set_bit) - bitop orr -ENDPROC(_set_bit) +bitop _set_bit, orr |