crypto: null - merge CRYPTO_NULL2 into CRYPTO_NULL

There is no reason to have separate CRYPTO_NULL2 and CRYPTO_NULL
options.  Just merge them into CRYPTO_NULL.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index cf5a427bb54dc27d1b7bb67e70036a4ddcd149f0..7347277bedf372027afe19ae4dc5854b39f5698b 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -192,16 +192,12 @@ config CRYPTO_MANAGER_EXTRA_TESTS
 
 config CRYPTO_NULL
        tristate "Null algorithms"
-       select CRYPTO_NULL2
+       select CRYPTO_ALGAPI
+       select CRYPTO_SKCIPHER
+       select CRYPTO_HASH
        help
          These are 'Null' algorithms, used by IPsec, which do nothing.
 
-config CRYPTO_NULL2
-       tristate
-       select CRYPTO_ALGAPI2
-       select CRYPTO_SKCIPHER2
-       select CRYPTO_HASH2
-
 config CRYPTO_PCRYPT
        tristate "Parallel crypto engine"
        depends on SMP

diff --git a/crypto/Makefile b/crypto/Makefile
index 84f6911dc9ba1363f032f7ade35bc46599459070..0f77e093512caa3481a7ed3507dac704301a3e6f 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -71,7 +71,7 @@ obj-$(CONFIG_CRYPTO_USER) += crypto_user.o
 obj-$(CONFIG_CRYPTO_CMAC) += cmac.o
 obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
 obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
-obj-$(CONFIG_CRYPTO_NULL2) += crypto_null.o
+obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
 obj-$(CONFIG_CRYPTO_MD4) += md4.o
 obj-$(CONFIG_CRYPTO_MD5) += md5.o
 obj-$(CONFIG_CRYPTO_RMD160) += rmd160.o