diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index b1915bb73..226d82bd0 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 572d17381..84175d6a2 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1325,11 +1325,6 @@ CONFIG_NET_SWITCHDEV=y
 ##
 CONFIG_SND_HDA_TEGRA=m
 
-##
-## file: sound/soc/davinci/Kconfig
-##
-CONFIG_SND_EDMA_SOC=m
-
 ##
 ## file: sound/soc/Kconfig
 ##
@@ -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 054b03c6b..503d76722 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