aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-cris/arch-v10/bitops.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-09 16:51:35 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-09 16:51:35 +0100
commitc973b112c76c9d8fd042991128f218a738cc8d0a (patch)
treee813b0da5d0a0e19e06de6462d145a29ad683026 /include/asm-cris/arch-v10/bitops.h
parentc5fbc3966f48279dbebfde10248c977014aa9988 (diff)
parent00dd1e433967872f3997a45d5adf35056fdf2f56 (diff)
downloadkernel_samsung_smdk4412-c973b112c76c9d8fd042991128f218a738cc8d0a.zip
kernel_samsung_smdk4412-c973b112c76c9d8fd042991128f218a738cc8d0a.tar.gz
kernel_samsung_smdk4412-c973b112c76c9d8fd042991128f218a738cc8d0a.tar.bz2
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'include/asm-cris/arch-v10/bitops.h')
-rw-r--r--include/asm-cris/arch-v10/bitops.h2
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 21b7ae8..b73f539 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)
*
* Undefined if no bit exists, so code should check against 0 first.
*/
-extern __inline__ unsigned long __ffs(unsigned long word)
+extern inline unsigned long __ffs(unsigned long word)
{
return cris_swapnwbrlz(~word);
}