diff --git a/[refs] b/[refs]
index c922397cf7fd..5e058eb1dffa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd7c4b604a6cd707803c7c6ba142bfa131f9a9f3
+refs/heads/master: ee1bec9b3b49ea05e97ef40a3d38b70628cb947a
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index 1a2221630e6a..2ddc9046868e 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -23,15 +23,6 @@ menuconfig NET
 
 if NET
 
-config NETLINK_MMAP
-	bool "Netlink: mmaped IO"
-	help
-	  This option enables support for memory mapped netlink IO. This
-	  reduces overhead by avoiding copying data between kernel- and
-	  userspace.
-
-	  If unsure, say N.
-
 config WANT_COMPAT_NETLINK_MESSAGES
 	bool
 	help
diff --git a/trunk/net/netlink/Kconfig b/trunk/net/netlink/Kconfig
index 5d6e8c05b3d4..2c5e95e9bfbd 100644
--- a/trunk/net/netlink/Kconfig
+++ b/trunk/net/netlink/Kconfig
@@ -2,6 +2,15 @@
 # Netlink Sockets
 #
 
+config NETLINK_MMAP
+	bool "NETLINK: mmaped IO"
+	---help---
+	  This option enables support for memory mapped netlink IO. This
+	  reduces overhead by avoiding copying data between kernel- and
+	  userspace.
+
+	  If unsure, say N.
+
 config NETLINK_DIAG
 	tristate "NETLINK: socket monitoring interface"
 	default n