diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-02 21:47:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-02 21:47:02 +0100 |
| commit | fb9bc66de6ef64ceecf770bcf163ba653d35888f (patch) | |
| tree | ec7c8facb99e23e5918e2782a400f5cafc14740c /crypto | |
| parent | b9e89cef449430b7dcdc79fccb245fed20d2692d (diff) | |
| parent | 9feb288acd39fa633c948112beda0bb439eefd34 (diff) | |
| download | linux-crypto-fb9bc66de6ef64ceecf770bcf163ba653d35888f.tar.gz linux-crypto-fb9bc66de6ef64ceecf770bcf163ba653d35888f.zip | |
Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for-next
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 00b5906f..77daef03 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -543,7 +543,7 @@ config CRYPTO_SHA1_ARM config CRYPTO_SHA1_ARM_NEON tristate "SHA1 digest algorithm (ARM NEON)" - depends on ARM && KERNEL_MODE_NEON && !CPU_BIG_ENDIAN + depends on ARM && KERNEL_MODE_NEON select CRYPTO_SHA1_ARM select CRYPTO_SHA1 select CRYPTO_HASH @@ -603,7 +603,7 @@ config CRYPTO_SHA512_SPARC64 config CRYPTO_SHA512_ARM_NEON tristate "SHA384 and SHA512 digest algorithm (ARM NEON)" - depends on ARM && KERNEL_MODE_NEON && !CPU_BIG_ENDIAN + depends on ARM && KERNEL_MODE_NEON select CRYPTO_SHA512 select CRYPTO_HASH help |