diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-13 15:30:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-13 15:30:10 -0800 |
| commit | 633d7b7e85cd6345a3e6ba76f177f508e0662773 (patch) | |
| tree | a3a5525ba8fd902c8da517250a593f27020898e0 /include | |
| parent | 515f4f3fd0297d2151c297f1636bd3e0b986ee91 (diff) | |
| parent | 6f64af399dc12e8f46aab8ce9d73eea67939f8f5 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/bitops.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h index 1289af2416c7..74850fac74c2 100644 --- a/include/asm-sparc64/bitops.h +++ b/include/asm-sparc64/bitops.h @@ -223,7 +223,8 @@ extern unsigned long find_next_bit(const unsigned long *, unsigned long, * on Linus's ALPHA routines, which are pretty portable BTW. */ -extern unsigned long find_next_zero_bit(unsigned long *, unsigned long, unsigned long); +extern unsigned long find_next_zero_bit(const unsigned long *, + unsigned long, unsigned long); #define find_first_zero_bit(addr, size) \ find_next_zero_bit((addr), (size), 0) |