diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 09:46:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 09:46:07 -0700 |
| commit | 674ff51776b012783e5a0ce8ce2fa56f5fec050c (patch) | |
| tree | 885be46dfa8a9ca1b45079cf476b478d1d22b795 /drivers | |
| parent | 36a1987cd891fa82d9981886c3abbbe82c428c0d (diff) | |
| parent | ad3b8a83933e83e5a2a08956211343bda269e778 (diff) | |
| download | linux-3.10-674ff51776b012783e5a0ce8ce2fa56f5fec050c.tar.gz linux-3.10-674ff51776b012783e5a0ce8ce2fa56f5fec050c.tar.bz2 linux-3.10-674ff51776b012783e5a0ce8ce2fa56f5fec050c.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM: SoC fixes from Olof Johansson:
"I will stop trying to predict when we're done with fixes for a
release.
Here's another small batch of three patches for arm-soc:
- A fix for a boot time WARN_ON() due to irq domain conversion on
PRIMA2
- Fix for a regression in Tegra SMP spinup code due to swapped
register offsets
- Fixed config dependency for mv_cesa crypto driver to avoid build
breakage"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: PRIMA2: fix irq domain size and IRQ mask of internal interrupt controller
crypto: mv_cesa requires on CRYPTO_HASH to build
ARM: tegra: Fix flow controller accesses
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index ab9abb46d01..dd414d9350e 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA select CRYPTO_ALGAPI select CRYPTO_AES select CRYPTO_BLKCIPHER2 + select CRYPTO_HASH help This driver allows you to utilize the Cryptographic Engines and Security Accelerator (CESA) which can be found on the Marvell Orion |