diff options
author | David S. Miller <davem@davemloft.net> | 2018-01-24 23:44:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-24 23:44:15 -0500 |
commit | 955bd1d216c6ce4f40b181cfd369f4116e0627f2 (patch) | |
tree | d3f2669d3abb1c53c2f364732e8122ce0f25e3da /arch/sparc | |
parent | be1b6e8b5470e8311bfa1a3dfd7bd59e85a99759 (diff) | |
parent | 5b7d27967dabfb17c21b0d98b29153b9e3ee71e5 (diff) | |
download | op-kernel-dev-955bd1d216c6ce4f40b181cfd369f4116e0627f2.zip op-kernel-dev-955bd1d216c6ce4f40b181cfd369f4116e0627f2.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/crypto/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/crypto/Makefile b/arch/sparc/crypto/Makefile index 818d3aa..d257186 100644 --- a/arch/sparc/crypto/Makefile +++ b/arch/sparc/crypto/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_CRYPTO_MD5_SPARC64) += md5-sparc64.o obj-$(CONFIG_CRYPTO_AES_SPARC64) += aes-sparc64.o obj-$(CONFIG_CRYPTO_DES_SPARC64) += des-sparc64.o -obj-$(CONFIG_CRYPTO_DES_SPARC64) += camellia-sparc64.o +obj-$(CONFIG_CRYPTO_CAMELLIA_SPARC64) += camellia-sparc64.o obj-$(CONFIG_CRYPTO_CRC32C_SPARC64) += crc32c-sparc64.o |