vserver 1.9.5.x5

[linux-2.6.git] / arch / ia64 / lib / bitop.c

diff --git a/arch/ia64/lib/bitop.c b/arch/ia64/lib/bitop.c
index 1c6ee49..82e299c 100644 (file)
--- a/arch/ia64/lib/bitop.c
+++ b/arch/ia64/lib/bitop.c
@@ -2,13 +2,13 @@
 #include <linux/types.h>
 #include <asm/intrinsics.h>
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 /*
  * Find next zero bit in a bitmap reasonably efficiently..
  */
 
-int __find_next_zero_bit (void *addr, unsigned long size, unsigned long offset)
+int __find_next_zero_bit (const void *addr, unsigned long size, unsigned long offset)
 {
        unsigned long *p = ((unsigned long *) addr) + (offset >> 6);
        unsigned long result = offset & ~63UL;