From: Jiri Slaby <jirislaby@gmail.com>

remove asm/bitops.h includes

including asm/bitops directly may cause compile errors. don't include it
and include linux/bitops instead. next patch will deny including asm header
directly.

Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 3c05eef3d0a98065323d7d6d9a78e0985eba4b10
tree cb9691832992f570b0363dd568f6fa3d2c81e3f5
parent 132bb039c741d00f066e7501e3613d2d20bf0595
author Jiri Slaby <jirislaby@gmail.com> Tue, 04 Sep 2007 21:01:35 +0200
committer Jiri Slaby <jirislaby@gmail.com> Tue, 04 Sep 2007 21:01:35 +0200

index 7ad84ea..32afaa3 100644
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/reiser4/jnode.h               |    2 +-
 fs/reiser4/plugin/space/bitmap.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/reiser4/jnode.h~remove-asm-bitopsh-includes-reiser4 fs/reiser4/jnode.h
--- a/fs/reiser4/jnode.h~remove-asm-bitopsh-includes-reiser4
+++ a/fs/reiser4/jnode.h
@@ -21,7 +21,7 @@
 #include <linux/mm.h>
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/list.h>
 #include <linux/rcupdate.h>
 
diff -puN fs/reiser4/plugin/space/bitmap.c~remove-asm-bitopsh-includes-reiser4 fs/reiser4/plugin/space/bitmap.c
--- a/fs/reiser4/plugin/space/bitmap.c~remove-asm-bitopsh-includes-reiser4
+++ a/fs/reiser4/plugin/space/bitmap.c
@@ -171,7 +171,7 @@ static int find_next_zero_bit_in_word(ul
 	return i;
 }
 
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #if BITS_PER_LONG == 64
 
_