init/Kconfig: move the trusted keyring config option to general setup
authorPeter Foley <pefoley2@pefoley.com>
Fri, 18 Apr 2014 22:07:11 +0000 (15:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 May 2014 20:20:30 +0000 (13:20 -0700)
commit184de1005a3eea00bb4d1d2df3e545dadcf5e9aa
treeab5a90357e9ca65b6aebe0d93418fa7be8e4d608
parent816c942dfb637bb5593cf58f10b7eab6895e7a66
init/Kconfig: move the trusted keyring config option to general setup

commit 82c04ff89eba09d0e46e3f3649c6d3aa18e764a0 upstream.

The SYSTEM_TRUSTED_KEYRING config option is not in any menu, causing it
to show up in the toplevel of the kernel configuration.  Fix this by
moving it under the General Setup menu.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
init/Kconfig