aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-08-15 20:46:22 -0400
committerEric W. Biederman <ebiederm@xmission.com>2012-08-24 01:52:54 -0400
commitbc45dae323112f2365d7ca307571781163d1bc04 (patch)
tree4d171549b981a6934d682f904b75318592f05d9a
parent898132ae76d1aeb52301f10e8795c34fbb54e853 (diff)
userns: Enable building of pf_key sockets when user namespace support is enabled.
Enable building of pf_key sockets and user namespace support at the same time. This combination builds successfully so there is no reason to forbid it. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--init/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index b445d6f49bcf..448b701b1722 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -944,7 +944,6 @@ config UIDGID_CONVERTED
944 # Networking 944 # Networking
945 depends on NET_9P = n 945 depends on NET_9P = n
946 depends on AF_RXRPC = n 946 depends on AF_RXRPC = n
947 depends on NET_KEY = n
948 depends on DNS_RESOLVER = n 947 depends on DNS_RESOLVER = n
949 948
950 # Filesystems 949 # Filesystems