aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-08-17 17:45:27 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-17 19:49:13 +0800
commita26bcb04861db3061bb7db11ce905aa037111f81 (patch)
treeb25fbc585bda17173f7f269467b2648aac609237
parentcrypto: amcc - Do a NULL check for pointer (diff)
downloadlinux-dev-a26bcb04861db3061bb7db11ce905aa037111f81.tar.xz
linux-dev-a26bcb04861db3061bb7db11ce905aa037111f81.zip
crypto: null - Use NULL2 in Makefile
The Kconfig option NULL2 has been added as CRYPTO_MANAGER now depends indirectly on NULL2. However, the Makefile was not updated to use the new option, resulting in potential build failures when only NULL2 is enabled. Fixes: 149a39717dcc ("crypto: aead - Add type-safe geniv init/exit helpers") Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index a16a7e7f2d60..f6229aef7595 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -46,7 +46,7 @@ obj-$(CONFIG_CRYPTO_CMAC) += cmac.o
obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
obj-$(CONFIG_CRYPTO_VMAC) += vmac.o
obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
-obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
+obj-$(CONFIG_CRYPTO_NULL2) += crypto_null.o
obj-$(CONFIG_CRYPTO_MD4) += md4.o
obj-$(CONFIG_CRYPTO_MD5) += md5.o
obj-$(CONFIG_CRYPTO_RMD128) += rmd128.o