[patch] s390: missing ifdef in bitops.h

[Heiko Carstens]

From: Cedric Le Goater <clg@xxxxxxxxxx>

Add missing #ifdef __KERNEL__ to asm-s390/bitops.h

Signed-off-by: Cedric Le Goater <clg@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
---

Patch is for -mm tree only and resolves a merge conflict.

 include/asm-s390/bitops.h |    3 +++
 1 file changed, 3 insertions(+)

diff -purN a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
--- a/include/asm-s390/bitops.h	2006-06-13 07:38:53.000000000 +0200
+++ b/include/asm-s390/bitops.h	2006-06-13 07:41:20.000000000 +0200
@@ -12,6 +12,9 @@
  *    Copyright (C) 1992, Linus Torvalds
  *
  */
+
+#ifdef __KERNEL__
+
 #include <linux/compiler.h>
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/