diff --git a/[refs] b/[refs]
index 6fa67691b09f..47f5586d6b47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8e7a33df0976459674dece4b630b5d59796ece7
+refs/heads/master: 619506d5dabb49b7f223a4f2f6b8d697574dd799
diff --git a/trunk/arch/s390/include/asm/cio.h b/trunk/arch/s390/include/asm/cio.h
index 55bde6035216..ad2b924167d7 100644
--- a/trunk/arch/s390/include/asm/cio.h
+++ b/trunk/arch/s390/include/asm/cio.h
@@ -9,6 +9,8 @@
 
 #define LPM_ANYPATH 0xff
 #define __MAX_CSSID 0
+#define __MAX_SUBCHANNEL 65535
+#define __MAX_SSID 3
 
 #include <asm/scsw.h>
 
diff --git a/trunk/drivers/s390/cio/css.h b/trunk/drivers/s390/cio/css.h
index 33bb4d891e16..4af3dfe70ef5 100644
--- a/trunk/drivers/s390/cio/css.h
+++ b/trunk/drivers/s390/cio/css.h
@@ -112,9 +112,6 @@ extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *);
 extern void css_reiterate_subchannels(void);
 void css_update_ssd_info(struct subchannel *sch);
 
-#define __MAX_SUBCHANNEL 65535
-#define __MAX_SSID 3
-
 struct channel_subsystem {
 	u8 cssid;
 	int valid;