---

yaml --- r: 204339 b: refs/heads/master c: bc94e59 h: refs/heads/master i: 204337: f136f0a 204335: bcdae9a v: v3
git-mirror · Jun 3, 2010 · 30e50a7 · 30e50a7
1 parent ad3d4ed
commit 30e50a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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