diff options
author | James Morris <james.l.morris@oracle.com> | 2014-07-24 13:36:19 +0200 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-07-24 13:36:19 +0200 |
commit | 4ca332e11df42604e784bd7da9e483160636d05e (patch) | |
tree | 82e6ba6dff978edc2132e751c19197de50218c7e /lib | |
parent | commoncap: don't alloc the credential unless needed in cap_task_prctl (diff) | |
parent | Merge branch 'keys-fixes' into keys-next (diff) | |
download | linux-4ca332e11df42604e784bd7da9e483160636d05e.tar.xz linux-4ca332e11df42604e784bd7da9e483160636d05e.zip |
Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 334f7722a999..a8a775730c09 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -451,7 +451,8 @@ config MPILIB config SIGNATURE tristate - depends on KEYS && CRYPTO + depends on KEYS + select CRYPTO select CRYPTO_SHA1 select MPILIB help |