diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:17:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 11:17:06 -0700 |
| commit | db08bf0877f3464fb0c2c37dcdd9f9683192ea26 (patch) | |
| tree | c9d47587ac07cb1622156899414c78f097fcb0c9 /arch/tile | |
| parent | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (diff) | |
| parent | 35dbc0e020c6587f78a6c17693beca73aead7b54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/io.h: allow people to override individual funcs
bitops: remove duplicated extern declarations
bitops: make asm-generic/bitops/find.h more generic
asm-generic: kdebug.h: Checkpatch cleanup
asm-generic: fcntl: make exported headers use strict posix types
asm-generic: cmpxchg does not handle non-long arguments
asm-generic: make atomic_add_unless a function
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/include/asm/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/include/asm/bitops.h b/arch/tile/include/asm/bitops.h index 6832b4be8990..6d4f0ff2c68c 100644 --- a/arch/tile/include/asm/bitops.h +++ b/arch/tile/include/asm/bitops.h @@ -120,6 +120,7 @@ static inline unsigned long __arch_hweight64(__u64 w) #include <asm-generic/bitops/const_hweight.h> #include <asm-generic/bitops/lock.h> +#include <asm-generic/bitops/find.h> #include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/ext2-non-atomic.h> #include <asm-generic/bitops/minix.h> |