From 30e50a7d7f2eefdafd97f9b0df6eb8178dcb00f5 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 3 Jun 2010 20:33:06 +1000 Subject: [PATCH] --- yaml --- r: 204339 b: refs/heads/master c: bc94e59662c13516d13e117b6edab4bec487d5a0 h: refs/heads/master i: 204337: f136f0acbad9af1d8d81c8e0d2069d4851410561 204335: bcdae9aebf46eec5347fa46f8f32debb2358753a v: v3 --- [refs] | 2 +- trunk/crypto/Kconfig | 7 ++++++- trunk/crypto/Makefile | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28fa6fa56157..b2d6e39bbe0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 749d811f10a410b64cf4c674c498ec04316ec373 +refs/heads/master: bc94e59662c13516d13e117b6edab4bec487d5a0 diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig index 9d9434f08c92..11d0f21fd417 100644 --- a/trunk/crypto/Kconfig +++ b/trunk/crypto/Kconfig @@ -79,6 +79,11 @@ config CRYPTO_RNG2 select CRYPTO_ALGAPI2 config CRYPTO_PCOMP + tristate + select CRYPTO_PCOMP2 + select CRYPTO_ALGAPI + +config CRYPTO_PCOMP2 tristate select CRYPTO_ALGAPI2 @@ -94,7 +99,7 @@ config CRYPTO_MANAGER2 select CRYPTO_AEAD2 select CRYPTO_HASH2 select CRYPTO_BLKCIPHER2 - select CRYPTO_PCOMP + select CRYPTO_PCOMP2 config CRYPTO_GF128MUL tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile index d7e6441df7fe..d1cfa051afe4 100644 --- a/trunk/crypto/Makefile +++ b/trunk/crypto/Makefile @@ -26,7 +26,7 @@ crypto_hash-objs += ahash.o crypto_hash-objs += shash.o obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o -obj-$(CONFIG_CRYPTO_PCOMP) += pcompress.o +obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o cryptomgr-objs := algboss.o testmgr.o