diff --git a/[refs] b/[refs]
index 2af88eae76ac..c09057c38f9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23c100d99c1dfd0bba49a63fb02a8f8fddad607b
+refs/heads/master: 1fce518e8e7de62597c823d6d795cafc694e7910
diff --git a/trunk/drivers/s390/char/fs3270.c b/trunk/drivers/s390/char/fs3270.c
index ef004d089712..b4557fa30858 100644
--- a/trunk/drivers/s390/char/fs3270.c
+++ b/trunk/drivers/s390/char/fs3270.c
@@ -17,7 +17,6 @@
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
-#include <asm/cpcmd.h>
 #include <asm/ebcdic.h>
 #include <asm/idals.h>