[patch] s390: missing ifdef in bitops.h

From: Cedric Le Goater <[email protected]>

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

Signed-off-by: Cedric Le Goater <[email protected]>
Signed-off-by: Heiko Carstens <[email protected]>
---

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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • Re: [patch] s390: missing ifdef in bitops.h
    • From: David Woodhouse <[email protected]>

• Prev by Date: Re: [PATCH 1/6] mm: tracking shared dirty pages
• Next by Date: Re: [PATCH 1/6] mm: tracking shared dirty pages
• Previous by thread: Tracking the Linux graphics (DRM/Fb/OpenGL/X/console) discussion
• Next by thread: Re: [patch] s390: missing ifdef in bitops.h
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]