From: Petr Štetiar Date: Tue, 23 Jun 2020 07:24:57 +0000 (+0200) Subject: armvirt,x86: fix build breakage of crypto ccp module X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=73e0ea1ea964f27097ff4009b5d55f31a40d2932;p=openwrt%2Fstaging%2Fadrian.git armvirt,x86: fix build breakage of crypto ccp module Upstream in commit f9f8f0c24203 ("crypto: ccp -- don't "select" CONFIG_DMADEVICES") removed dependency on CONFIG_DMADEVICES symbol which leads to build breakage of ccp crypto module, so fix this by adding that symbol back in the kernel config. Fixes: f4985a22ca1b ("kernel: Update kernel 4.14 to version 4.14.187") Signed-off-by: Petr Štetiar (cherry picked from commit 472b8fc91bbab0530d72e9780a482bacc1bbe5f7) --- diff --git a/target/linux/armvirt/config-4.14 b/target/linux/armvirt/config-4.14 index a2d8bb4f20..b46e89b4ee 100644 --- a/target/linux/armvirt/config-4.14 +++ b/target/linux/armvirt/config-4.14 @@ -39,6 +39,7 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DMADEVICES=y CONFIG_DTC=y CONFIG_EDAC_SUPPORT=y CONFIG_EXT4_FS=y diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index 5abec3b6eb..355a8cbcdc 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -115,6 +115,7 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set +CONFIG_DMADEVICES=y CONFIG_DMI=y CONFIG_DMIID=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y