diff --git a/[refs] b/[refs]
index 3f331131529a..8d00790f3aa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df27d7baf6fadfc7a2a5e57e7ea43010dc819096
+refs/heads/master: 2f319a5249830392090896cd794fabf9d6d4a4ed
diff --git a/trunk/arch/s390/include/asm/sockios.h b/trunk/arch/s390/include/asm/sockios.h
index f4fc16c7da59..6f60eee73242 100644
--- a/trunk/arch/s390/include/asm/sockios.h
+++ b/trunk/arch/s390/include/asm/sockios.h
@@ -1,21 +1,6 @@
-/*
- *  include/asm-s390/sockios.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/sockios.h"
- */
+#ifndef _ASM_S390_SOCKIOS_H
+#define _ASM_S390_SOCKIOS_H
 
-#ifndef __ARCH_S390_SOCKIOS__
-#define __ARCH_S390_SOCKIOS__
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN 	0x8901
-#define SIOCSPGRP	0x8902
-#define FIOGETOWN	0x8903
-#define SIOCGPGRP	0x8904
-#define SIOCATMARK	0x8905
-#define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
-#define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
+#include <asm-generic/sockios.h>
 
 #endif