aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-05-10 11:46:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-05-10 11:46:41 +0000
commit9913b6a90af2eddda0166ed2cc14fd2275758d2d (patch)
tree8e07d8767175ed249bc7edf9b88b0548cc03aac8
parent58683312140cb2cd0e0c4aa3163bfaae0d211aff (diff)
downloadupstream-9913b6a90af2eddda0166ed2cc14fd2275758d2d.tar.gz
upstream-9913b6a90af2eddda0166ed2cc14fd2275758d2d.tar.bz2
upstream-9913b6a90af2eddda0166ed2cc14fd2275758d2d.zip
generic: add CRYPTO_DEV_QCE option to default config
This option has been added in kernel 3.17. It shows-up only when both ARCH_QCOM and CRYPTO are enabled. So we'll disable these two by default to avoid stalling the build when these conditions are met. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45658
-rw-r--r--target/linux/generic/config-3.181
-rw-r--r--target/linux/generic/config-4.01
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 8cc909f2a9..13e172f46b 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -727,6 +727,7 @@ CONFIG_CRYPTO_ALGAPI2=y
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
# CONFIG_CRYPTO_DEV_MV_CESA is not set
# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
# CONFIG_CRYPTO_DEV_TALITOS is not set
# CONFIG_CRYPTO_DRBG_MENU is not set
diff --git a/target/linux/generic/config-4.0 b/target/linux/generic/config-4.0
index b5c952e259..c3bb7fc385 100644
--- a/target/linux/generic/config-4.0
+++ b/target/linux/generic/config-4.0
@@ -737,6 +737,7 @@ CONFIG_CRYPTO_ALGAPI2=y
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
# CONFIG_CRYPTO_DEV_MV_CESA is not set
# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QCE is not set
# CONFIG_CRYPTO_DEV_SAHARA is not set
# CONFIG_CRYPTO_DEV_TALITOS is not set
# CONFIG_CRYPTO_DRBG_MENU is not set