diff --git a/[refs] b/[refs]
index 9ef9650dc9ec..46ad7817e9fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a8feb4275739012a5a11488439d3c1b8e1ca809
+refs/heads/master: 5588d3742da9900323dc3d766845a53bacdfb5ab
diff --git a/trunk/arch/mips/include/uapi/asm/socket.h b/trunk/arch/mips/include/uapi/asm/socket.h
index 7e2723637b35..3e68bfbda6bc 100644
--- a/trunk/arch/mips/include/uapi/asm/socket.h
+++ b/trunk/arch/mips/include/uapi/asm/socket.h
@@ -29,7 +29,6 @@
 				   socket to transmit pending data.  */
 #define SO_OOBINLINE 0x0100	/* Receive out-of-band data in-band.  */
 #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.  */
-#endif
 
 #define SO_TYPE		0x1008	/* Compatible name for SO_STYLE.  */
 #define SO_STYLE	SO_TYPE	/* Synonym */