diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-m68knommu/bitops.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-m68knommu/bitops.h')
| -rw-r--r-- | include/asm-m68knommu/bitops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-m68knommu/bitops.h b/include/asm-m68knommu/bitops.h index f8dfb7ba2e25..f43afe1fc3b3 100644 --- a/include/asm-m68knommu/bitops.h +++ b/include/asm-m68knommu/bitops.h | |||
| @@ -294,6 +294,8 @@ found_middle: | |||
| 294 | return result + ffz(__swab32(tmp)); | 294 | return result + ffz(__swab32(tmp)); |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | #define ext2_find_next_bit(addr, size, off) \ | ||
| 298 | generic_find_next_le_bit((unsigned long *)(addr), (size), (off)) | ||
| 297 | #include <asm-generic/bitops/minix.h> | 299 | #include <asm-generic/bitops/minix.h> |
| 298 | 300 | ||
| 299 | #endif /* __KERNEL__ */ | 301 | #endif /* __KERNEL__ */ |