diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-28 04:01:34 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 04:01:34 +0000 |
| commit | 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde (patch) | |
| tree | 6141d4d7a8eb7c557705bdfa764137d4fd2e4924 /include/asm-sh/bitops.h | |
| parent | d09e860cf07e7c9ee12920a09f5080e30a12a23a (diff) | |
| parent | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (diff) | |
| download | linux-1dbbb6077426f8ce63d6a59c5ac6613e1689cbde.tar.gz linux-1dbbb6077426f8ce63d6a59c5ac6613e1689cbde.tar.bz2 linux-1dbbb6077426f8ce63d6a59c5ac6613e1689cbde.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh/bitops.h')
| -rw-r--r-- | include/asm-sh/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h index b6ba5a60dec2..d7d382f63ee5 100644 --- a/include/asm-sh/bitops.h +++ b/include/asm-sh/bitops.h @@ -95,6 +95,7 @@ static inline unsigned long ffz(unsigned long word) #include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/minix.h> #include <asm-generic/bitops/fls.h> +#include <asm-generic/bitops/__fls.h> #include <asm-generic/bitops/fls64.h> #endif /* __KERNEL__ */ |