3 files changed, 6 insertions, 8 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1eb4bcdb344f..c4b6c9125582 100644
--- a/crypto/Kconfig
+++ b/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/crypto/Makefile b/crypto/Makefile
index 83532ac8466d..2a1883fabf42 100644
--- a/crypto/Makefile
+++ b/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/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d848e1b1624b..d8c70403b9da 100644
--- a/drivers/crypto/Kconfig
+++ b/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.