diff --git a/[refs] b/[refs]
index c7428957ad8b..a047273def33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fde28451359b476ba065a9a16fa83aa44168fe59
+refs/heads/master: 87d2f5e39835b990d3c78d25144dc05b068f697e
diff --git a/trunk/arch/s390/include/asm/chpid.h b/trunk/arch/s390/include/asm/chpid.h
index fc71d8a6709b..8e88e2221771 100644
--- a/trunk/arch/s390/include/asm/chpid.h
+++ b/trunk/arch/s390/include/asm/chpid.h
@@ -6,7 +6,7 @@
  */
 
 #ifndef _ASM_S390_CHPID_H
-#define _ASM_S390_CHPID_H _ASM_S390_CHPID_H
+#define _ASM_S390_CHPID_H
 
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/trunk/arch/s390/include/asm/itcw.h b/trunk/arch/s390/include/asm/itcw.h
index a9bc5c36b32a..fb1bedd3dc0d 100644
--- a/trunk/arch/s390/include/asm/itcw.h
+++ b/trunk/arch/s390/include/asm/itcw.h
@@ -6,7 +6,7 @@
  */
 
 #ifndef _ASM_S390_ITCW_H
-#define _ASM_S390_ITCW_H _ASM_S390_ITCW_H
+#define _ASM_S390_ITCW_H
 
 #include <linux/types.h>
 #include <asm/fcx.h>