diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-12-05 23:20:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-05 23:20:36 +0000 |
| commit | 3e01fad460e571f24273046f1c11a6c77028e712 (patch) | |
| tree | 6d332059bc3b2afcdbfd6df05c782b028372f2df | |
| parent | 369c1ea1433a2c5ff7d365b0aa4856385af04dd7 (diff) | |
| parent | b5d4d64d17148d414d2dcc7af17c957af1bcf676 (diff) | |
| download | imx-v4.1-3e01fad460e571f24273046f1c11a6c77028e712.tar.gz | |
Merge "Disable CAAM module" into nyc-iot-dev
| -rw-r--r-- | arch/arm/configs/imx_v7_android_defconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/configs/imx_v7_android_defconfig b/arch/arm/configs/imx_v7_android_defconfig index 6e50b5430f30..74f3a8bd9be5 100644 --- a/arch/arm/configs/imx_v7_android_defconfig +++ b/arch/arm/configs/imx_v7_android_defconfig @@ -667,10 +667,6 @@ CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_CAMELLIA=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_FSL_CAAM=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRC_CCITT=y CONFIG_CRC_T10DIF=y CONFIG_CRC7=y |