diff options
author | 2012-01-09 09:56:37 +0900 | |
---|---|---|
committer | 2012-01-09 09:56:37 +0900 | |
commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/arm/lib/clearbit.S | |
parent | Merge branch 'rmobile-fixes-for-linus' into rmobile-latest (diff) | |
parent | audit: always follow va_copy() with va_end() (diff) | |
download | linux-dev-04cf399640b7acfa9abe2eb7900cd934db8af697.tar.xz linux-dev-04cf399640b7acfa9abe2eb7900cd934db8af697.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/lib/clearbit.S')
-rw-r--r-- | arch/arm/lib/clearbit.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/lib/clearbit.S b/arch/arm/lib/clearbit.S index 4c04c3b51eeb..f6b75fb64d30 100644 --- a/arch/arm/lib/clearbit.S +++ b/arch/arm/lib/clearbit.S @@ -12,6 +12,4 @@ #include "bitops.h" .text -ENTRY(_clear_bit) - bitop bic -ENDPROC(_clear_bit) +bitop _clear_bit, bic |