diff options
| author | Linus Torvalds | 2018-01-24 15:49:02 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-01-24 15:49:02 -0800 |
| commit | f16549530924abd60554358283ed20e0203494f9 (patch) | |
| tree | 03dc821a584f83f41abbece9703c19c36a223986 /arch | |
| parent | 3eab2ad9162e7467c988b91f50395eac51a1e650 (diff) | |
| parent | aebb48f5e465772576359c1705c4a84abea92027 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc bugfix from David Miller:
"Sparc Makefile typo fix"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64
Diffstat (limited to 'arch')
| -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 818d3aa5172e..d257186c27d1 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 |