diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
| commit | c3afafa47898e34eb49828ec4ac92bcdc81c8f0c (patch) | |
| tree | 055f603e131de9c4d36dafb1856fe69c737152de /drivers/char | |
| parent | crypto: caam - treat SGT address pointer as u64 (diff) | |
| parent | crypto: vmx - Fix memory corruption caused by p8_ghash (diff) | |
| download | linux-dev-c3afafa47898e34eb49828ec4ac92bcdc81c8f0c.tar.xz linux-dev-c3afafa47898e34eb49828ec4ac92bcdc81c8f0c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in vmx ghash fix.
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index fb9c7adfdb3a..200dab5136a7 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -244,7 +244,7 @@ config HW_RANDOM_TX4939 config HW_RANDOM_MXC_RNGA tristate "Freescale i.MX RNGA Random Number Generator" - depends on ARCH_HAS_RNGA + depends on SOC_IMX31 default HW_RANDOM ---help--- This driver provides kernel-side support for the Random Number |