From: Heiko Carstens <heiko.carstens@de.ibm.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Cedric Le Goater <clg@fr.ibm.com>
Subject: [patch] s390: missing ifdef in bitops.h
Date: Tue, 13 Jun 2006 14:09:16 +0200 [thread overview]
Message-ID: <20060613120916.GA9405@osiris.boeblingen.de.ibm.com> (raw)
From: Cedric Le Goater <clg@fr.ibm.com>
Add missing #ifdef __KERNEL__ to asm-s390/bitops.h
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
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>
/*
next reply other threads:[~2006-06-13 12:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-13 12:09 Heiko Carstens [this message]
2006-06-13 15:17 ` David Woodhouse
2006-06-13 20:33 ` Arnd Bergmann
2006-06-13 20:39 ` David Woodhouse
2006-06-14 5:14 ` Heiko Carstens
2006-06-13 20:43 ` Arnd Bergmann
2006-06-14 10:50 ` Martin Schwidefsky
2006-06-14 13:04 ` David Woodhouse
2006-06-14 13:06 ` Martin Schwidefsky
2006-06-14 8:57 ` Martin Schwidefsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060613120916.GA9405@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de.ibm.com \
--cc=akpm@osdl.org \
--cc=clg@fr.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®