diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 18:23:35 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 18:23:35 +0400 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/arm/lib/testclearbit.S | |
| parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
| parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
| download | linux-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.xz | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'arch/arm/lib/testclearbit.S')
| -rw-r--r-- | arch/arm/lib/testclearbit.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S index 521b66b5b95d..918841dcce7a 100644 --- a/arch/arm/lib/testclearbit.S +++ b/arch/arm/lib/testclearbit.S @@ -12,6 +12,4 @@ #include "bitops.h" .text -ENTRY(_test_and_clear_bit) - testop bicne, strne -ENDPROC(_test_and_clear_bit) +testop _test_and_clear_bit, bicne, strne |