---

yaml --- r: 369909 b: refs/heads/master c: ee1bec9 h: refs/heads/master i: 369907: 1c6ae8f v: v3
git-mirror · May 1, 2013 · 4b40507 · 4b40507
1 parent 42e2cb2
commit 4b40507
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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