diff options
author | 2011-08-31 08:58:36 -0700 | |
---|---|---|
committer | 2011-08-31 08:58:36 -0700 | |
commit | e9208a4eec8acbde7ede6516c39dea05f3b700dc (patch) | |
tree | bf1e775785370a7b2fe0844b7725f47e4c66335c /arch/powerpc/configs/corenet64_smp_defconfig | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
parent | powerpc/p1023rds: Fix the error of bank-width of nor flash (diff) | |
download | linux-dev-e9208a4eec8acbde7ede6516c39dea05f3b700dc.tar.xz linux-dev-e9208a4eec8acbde7ede6516c39dea05f3b700dc.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/p1023rds: Fix the error of bank-width of nor flash
powerpc/85xx: enable caam crypto driver by default
powerpc/85xx: enable the audio drivers in the defconfigs
Diffstat (limited to 'arch/powerpc/configs/corenet64_smp_defconfig')
-rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index d32283555b53..c92c204a204b 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig @@ -100,5 +100,8 @@ CONFIG_DEBUG_INFO=y CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_VIRQ_DEBUG=y CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_TALITOS=y +CONFIG_CRYPTO_DEV_FSL_CAAM=y |