aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/cyanogenmod_n7000_defconfig
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-14 20:34:50 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-14 20:34:50 +0100
commit9ea26e897dad9f186a37346cceba380c81fa7e9a (patch)
treeee1d39fe7c66cc996f282d9b162f3efd7cf72ebd /arch/arm/configs/cyanogenmod_n7000_defconfig
parent9cd722820c1211157199154242bb6b4baf90e86d (diff)
parent764df269b7e4e2784ab4acb841e503b364552641 (diff)
downloadkernel_samsung_smdk4412-9ea26e897dad9f186a37346cceba380c81fa7e9a.zip
kernel_samsung_smdk4412-9ea26e897dad9f186a37346cceba380c81fa7e9a.tar.gz
kernel_samsung_smdk4412-9ea26e897dad9f186a37346cceba380c81fa7e9a.tar.bz2
Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0
Diffstat (limited to 'arch/arm/configs/cyanogenmod_n7000_defconfig')
-rw-r--r--arch/arm/configs/cyanogenmod_n7000_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/cyanogenmod_n7000_defconfig b/arch/arm/configs/cyanogenmod_n7000_defconfig
index 2880b47..b31ba0b 100644
--- a/arch/arm/configs/cyanogenmod_n7000_defconfig
+++ b/arch/arm/configs/cyanogenmod_n7000_defconfig
@@ -3123,6 +3123,7 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not set
CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_TGR192 is not set
@@ -3132,6 +3133,7 @@ CONFIG_CRYPTO_SHA512=y
# Ciphers
#
CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_ARM=y
# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_BLOWFISH is not set