diff --git a/[refs] b/[refs]
index 15353e59775a..c5723be570c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b26e478f8fd5b575684f021b05a5c6236ebb911a
+refs/heads/master: e7c466e58eb1ff9bf49c2f3902622dc11a8c7022
diff --git a/trunk/include/linux/inet_diag.h b/trunk/include/linux/inet_diag.h
index 78972a149dff..a27e62178d43 100644
--- a/trunk/include/linux/inet_diag.h
+++ b/trunk/include/linux/inet_diag.h
@@ -6,7 +6,6 @@
 /* Just some random number */
 #define TCPDIAG_GETSOCK 18
 #define DCCPDIAG_GETSOCK 19
-#define SOCK_DIAG_BY_FAMILY 20
 
 #define INET_DIAG_GETSOCK_MAX 24
 
diff --git a/trunk/include/linux/sock_diag.h b/trunk/include/linux/sock_diag.h
index ba4933b1213b..7999778ad08d 100644
--- a/trunk/include/linux/sock_diag.h
+++ b/trunk/include/linux/sock_diag.h
@@ -1,5 +1,8 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
+
+#define SOCK_DIAG_BY_FAMILY 20
+
 struct sk_buff;
 struct nlmsghdr;