aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-08-06 00:26:26 +0800
committerBen Hutchings <ben@decadent.org.uk>2018-08-13 17:02:28 +0100
commit11f59ab47b0c9c435bbf2fb023ab71740769cd2b (patch)
treea785178b88d9967fc1151541ffdf1f5dcd778b7e
parent2edef6c796f7c2d7873c432178265a1cf6c8ca40 (diff)
downloadkernel_replicant_linux-11f59ab47b0c9c435bbf2fb023ab71740769cd2b.tar.gz
kernel_replicant_linux-11f59ab47b0c9c435bbf2fb023ab71740769cd2b.tar.bz2
kernel_replicant_linux-11f59ab47b0c9c435bbf2fb023ab71740769cd2b.zip
Update config for 4.17 using kconfigeditor2
- CONFIG_CRYPTO_SALSA20_{586,X86_64} were removed - CONFIG_SND_EDMA_SOC was moved
-rw-r--r--debian/config/amd64/config1
-rw-r--r--debian/config/armhf/config6
-rw-r--r--debian/config/i386/config1
3 files changed, 1 insertions, 7 deletions
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index b1915bb73533..226d82bd073f 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -62,7 +62,6 @@ CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6_AVX_X86_64=m
CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_CHACHA20_X86_64=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 572d17381cc9..84175d6a2566 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1326,11 +1326,6 @@ CONFIG_NET_SWITCHDEV=y
CONFIG_SND_HDA_TEGRA=m
##
-## file: sound/soc/davinci/Kconfig
-##
-CONFIG_SND_EDMA_SOC=m
-
-##
## file: sound/soc/Kconfig
##
CONFIG_SND_SOC=m
@@ -1343,6 +1338,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
##
## file: sound/soc/davinci/Kconfig
##
+CONFIG_SND_EDMA_SOC=m
CONFIG_SND_DAVINCI_SOC_MCASP=m
##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 054b03c6b0b3..503d76722362 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -52,7 +52,6 @@ CONFIG_X86_GENERIC=y
## file: crypto/Kconfig
##
CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_SALSA20_586=m
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_TWOFISH_586=m