From 1e4dff0dc9a2910e65489663aa072ed5e7a7af5a Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 30 Apr 2008 13:38:35 +0200
Subject: [PATCH] --- yaml --- r: 95327 b: refs/heads/master c:
 f291e17227cf30432ca7c402220f62e6924dd97d h: refs/heads/master i:   95325:
 33f4c3cda302cc92966f29110636872ab31615bd   95323:
 3aa70ef17f4d70f3e132f0e70890f8245fde8105   95319:
 4eaa1f8b7b584ba6665efa7847ea783e0734de58   95311:
 1752cad37e862292ff4f211751d4329a68ee6e56   95295:
 147a7423a92bc2f4f2d4f1f18563fd4ff9f28746 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-s390/sysinfo.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 43bfa5a7caf9..5f60f6437a6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e83be7b24ba4fe40acf0b967bd6ae8c9ac79bde
+refs/heads/master: f291e17227cf30432ca7c402220f62e6924dd97d
diff --git a/trunk/include/asm-s390/sysinfo.h b/trunk/include/asm-s390/sysinfo.h
index abe10ae15e46..79d01343f8b0 100644
--- a/trunk/include/asm-s390/sysinfo.h
+++ b/trunk/include/asm-s390/sysinfo.h
@@ -11,6 +11,9 @@
  *		 Christian Borntraeger <borntraeger@de.ibm.com>
  */
 
+#ifndef __ASM_S390_SYSINFO_H
+#define __ASM_S390_SYSINFO_H
+
 struct sysinfo_1_1_1 {
 	char reserved_0[32];
 	char manufacturer[16];
@@ -114,3 +117,5 @@ static inline int stsi(void *sysinfo, int fc, int sel1, int sel2)
 		: "cc", "memory");
 	return r0;
 }
+
+#endif /* __ASM_S390_SYSINFO_H */