From 235b8e7badd2b5ef48e6cdf0f85234aa865d511a Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Fri, 5 Oct 2012 10:44:39 +0200
Subject: [PATCH] --- yaml --- r: 333009 b: refs/heads/master c:
 c6cfc207d4f1219f5c906a36506b206dd6250847 h: refs/heads/master i:   333007:
 38b54b8963988c1bf371f6e0afb85e1daee5ec92 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/s390/include/asm/css_chars.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 785e10b0a3df..2f91f4786e19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dcc2a4d6c37c36155ea6d6305f15e599531b862
+refs/heads/master: c6cfc207d4f1219f5c906a36506b206dd6250847
diff --git a/trunk/arch/s390/include/asm/css_chars.h b/trunk/arch/s390/include/asm/css_chars.h
index a06ebc2623fb..7e1c917bbba2 100644
--- a/trunk/arch/s390/include/asm/css_chars.h
+++ b/trunk/arch/s390/include/asm/css_chars.h
@@ -3,8 +3,6 @@
 
 #include <linux/types.h>
 
-#ifdef __KERNEL__
-
 struct css_general_char {
 	u64 : 12;
 	u32 dynio : 1;	 /* bit 12 */
@@ -35,5 +33,4 @@ struct css_general_char {
 
 extern struct css_general_char css_general_characteristics;
 
-#endif /* __KERNEL__ */
 #endif