summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-08-15 17:46:22 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-08-23 22:52:54 -0700
commitbc45dae323112f2365d7ca307571781163d1bc04 (patch)
tree4d171549b981a6934d682f904b75318592f05d9a /init
parent898132ae76d1aeb52301f10e8795c34fbb54e853 (diff)
downloadop-kernel-dev-bc45dae323112f2365d7ca307571781163d1bc04.zip
op-kernel-dev-bc45dae323112f2365d7ca307571781163d1bc04.tar.gz
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>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index b445d6f..448b701 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -944,7 +944,6 @@ config UIDGID_CONVERTED
# Networking
depends on NET_9P = n
depends on AF_RXRPC = n
- depends on NET_KEY = n
depends on DNS_RESOLVER = n
# Filesystems
OpenPOWER on IntegriCloud