diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-14 20:34:50 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-14 20:34:50 +0100 |
| commit | 9ea26e897dad9f186a37346cceba380c81fa7e9a (patch) | |
| tree | ee1d39fe7c66cc996f282d9b162f3efd7cf72ebd /arch/arm/configs/cyanogenmod_i9300_defconfig | |
| parent | 9cd722820c1211157199154242bb6b4baf90e86d (diff) | |
| parent | 764df269b7e4e2784ab4acb841e503b364552641 (diff) | |
| download | kernel_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_i9300_defconfig')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i9300_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig index 9703150..3b79080 100644 --- a/arch/arm/configs/cyanogenmod_i9300_defconfig +++ b/arch/arm/configs/cyanogenmod_i9300_defconfig @@ -587,6 +587,7 @@ CONFIG_ARM_TRUSTZONE=y CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set CONFIG_SWP_EMULATE=y +CONFIG_IDIV_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -3287,6 +3288,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 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -3296,6 +3298,7 @@ CONFIG_CRYPTO_SHA256=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 |