diff --git a/[refs] b/[refs]
index b76f6483802c..f4152f88e46e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 005f8eee6f3c8173e492d7bd4d51bda990eb468b
+refs/heads/master: ef3500b2b2955af4fa6b0564b51c0c604e38c571
diff --git a/trunk/arch/s390/kernel/ipl.c b/trunk/arch/s390/kernel/ipl.c
index 56d876904ecc..6f3711a0eaaa 100644
--- a/trunk/arch/s390/kernel/ipl.c
+++ b/trunk/arch/s390/kernel/ipl.c
@@ -23,7 +23,6 @@
 #include <asm/ebcdic.h>
 #include <asm/reset.h>
 #include <asm/sclp.h>
-#include <asm/setup.h>
 #include <asm/checksum.h>
 
 #define IPL_PARM_BLOCK_VERSION 0