diff options
| author | Mikael Starvik <mikael.starvik@axis.com> | 2005-07-27 14:44:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:01 -0400 |
| commit | 5d01e6ce785884a5db5792cd2e5bb36fa82fe23c (patch) | |
| tree | aec09f0c058a6750904b947733a6cc7033359447 /include/asm-cris/arch-v10/bitops.h | |
| parent | dcf1310b72149d016970c666539d4d73bb77c086 (diff) | |
[PATCH] CRIS update: updates for 2.6.12
Patches to make CRIS work with 2.6.12.
Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris/arch-v10/bitops.h')
| -rw-r--r-- | include/asm-cris/arch-v10/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/arch-v10/bitops.h b/include/asm-cris/arch-v10/bitops.h index 21b7ae8c9bb..b73f5396e5a 100644 --- a/include/asm-cris/arch-v10/bitops.h +++ b/include/asm-cris/arch-v10/bitops.h | |||
| @@ -51,7 +51,7 @@ extern inline unsigned long ffz(unsigned long w) | |||
| 51 | * | 51 | * |
| 52 | * Undefined if no bit exists, so code should check against 0 first. | 52 | * Undefined if no bit exists, so code should check against 0 first. |
| 53 | */ | 53 | */ |
| 54 | extern __inline__ unsigned long __ffs(unsigned long word) | 54 | extern inline unsigned long __ffs(unsigned long word) |
| 55 | { | 55 | { |
| 56 | return cris_swapnwbrlz(~word); | 56 | return cris_swapnwbrlz(~word); |
| 57 | } | 57 | } |