diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:26:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:28:19 +0200 |
| commit | 8becc9953f7f8b7980106ced51ec8ed67ccc09f9 (patch) | |
| tree | b181b3caa976d4d1409fb30d92bb451b1139ab3c /crypto/Kconfig | |
| parent | 0f792db0c4f74e99a1a9ccc6694abf60c4b41a5a (diff) | |
| parent | 491fba88036f54220ebdbb2d0fc54e17f68c6d7e (diff) | |
| download | linux-crypto-8becc9953f7f8b7980106ced51ec8ed67ccc09f9.tar.gz linux-crypto-8becc9953f7f8b7980106ced51ec8ed67ccc09f9.zip | |
Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued
Pull in patches Jani applied while I was on vacation.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 8aaf298a..362905e7 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1512,15 +1512,6 @@ config CRYPTO_USER_API_RNG This option enables the user-spaces interface for random number generator algorithms. -config CRYPTO_USER_API_AEAD - tristate "User-space interface for AEAD cipher algorithms" - depends on NET - select CRYPTO_AEAD - select CRYPTO_USER_API - help - This option enables the user-spaces interface for AEAD - cipher algorithms. - config CRYPTO_HASH_INFO bool |