From a5350a7346840d64b09ff629773a342f3588a36c Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 27 Nov 2007 19:48:27 +0800
Subject: [PATCH] --- yaml --- r: 75963 b: refs/heads/master c:
 653ebd9c8510a7d647ed23e66e1338f848ebdbab h: refs/heads/master i:   75961:
 c9660c298e35111a05ddc47822a5b76da77dfdae   75959:
 5c33e6ecdcc0a13a4a338e453c97054303ea14b3 v: v3

---
 [refs]                       | 2 +-
 trunk/crypto/Kconfig         | 6 +-----
 trunk/crypto/Makefile        | 6 ++++--
 trunk/drivers/crypto/Kconfig | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4ad739e54dae..007bd9a1ff8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2589469d7bc69bdfad4e05d88a0d2748f92ef0f3
+refs/heads/master: 653ebd9c8510a7d647ed23e66e1338f848ebdbab
diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig
index 1eb4bcdb344f..c4b6c9125582 100644
--- a/trunk/crypto/Kconfig
+++ b/trunk/crypto/Kconfig
@@ -24,10 +24,6 @@ config CRYPTO_ALGAPI
 	help
 	  This option provides the API for cryptographic algorithms.
 
-config CRYPTO_ABLKCIPHER
-	tristate
-	select CRYPTO_BLKCIPHER
-
 config CRYPTO_AEAD
 	tristate
 	select CRYPTO_ALGAPI
@@ -217,7 +213,7 @@ config CRYPTO_GCM
 
 config CRYPTO_CRYPTD
 	tristate "Software async crypto daemon"
-	select CRYPTO_ABLKCIPHER
+	select CRYPTO_BLKCIPHER
 	select CRYPTO_MANAGER
 	help
 	  This is a generic software asynchronous crypto daemon that
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index 83532ac8466d..2a1883fabf42 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -8,9 +8,11 @@ crypto_algapi-$(CONFIG_PROC_FS) += proc.o
 crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
 obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o
 
-obj-$(CONFIG_CRYPTO_ABLKCIPHER) += ablkcipher.o
 obj-$(CONFIG_CRYPTO_AEAD) += aead.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += blkcipher.o
+
+crypto_blkcipher-objs := ablkcipher.o
+crypto_blkcipher-objs += blkcipher.o
+obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
 
 crypto_hash-objs := hash.o
 obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
diff --git a/trunk/drivers/crypto/Kconfig b/trunk/drivers/crypto/Kconfig
index d848e1b1624b..d8c70403b9da 100644
--- a/trunk/drivers/crypto/Kconfig
+++ b/trunk/drivers/crypto/Kconfig
@@ -87,7 +87,7 @@ config CRYPTO_DEV_HIFN_795X
 	tristate "Driver HIFN 795x crypto accelerator chips"
 	select CRYPTO_DES
 	select CRYPTO_ALGAPI
-	select CRYPTO_ABLKCIPHER
+	select CRYPTO_BLKCIPHER
 	depends on PCI
 	help
 	  This option allows you to have support for HIFN 795x crypto adapters.