diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index c3bd0bcc2fb0..8abf3f6e9969 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -248,27 +248,22 @@ CONFIG_ZONE_DEVICE=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 ##
-## file: sound/soc/sof/Kconfig
+## file: sound/pci/hda/Kconfig
 ##
-
-CONFIG_SND_SOC_SOF_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_PCI=m
-CONFIG_SND_SOC_SOF_ACPI=m
-
-##
-## file: sound/soc/sof/intel/Kconfig
-##
-CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
-CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
-CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_HDA_LINK=y
-CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
 
 ##
 ## file: sound/soc/intel/Kconfig
@@ -292,23 +287,28 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 
 ##
-## file: sound/pci/hda/Kconfig
+## file: sound/soc/sof/Kconfig
 ##
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+
+##
+## file: sound/soc/sof/intel/Kconfig
+##
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+
diff --git a/debian/config/armel/config.rpi b/debian/config/armel/config.rpi
index 524331eacc4a..7fc1158b0db1 100644
--- a/debian/config/armel/config.rpi
+++ b/debian/config/armel/config.rpi
@@ -71,7 +71,7 @@ CONFIG_MMC_SDHCI_IPROC=y
 CONFIG_MMC_BCM2835=y
 
 ##
-## file: drivers/net/wireless/broadcom/brcm80211/Kconfig
+## file: drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig
 ##
 CONFIG_BRCMFMAC_SDIO=y
 
diff --git a/debian/config/config b/debian/config/config
index 8745890a785d..32b45846ec4e 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5307,7 +5307,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index a8c69f415b1e..b6aee6d0bea8 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -79,16 +79,16 @@ CONFIG_SUN_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_SYSV68_PARTITION=y
 
-##
-## file: drivers/accessibility/Kconfig
-##
-# CONFIG_ACCESSIBILITY is not set
-
 ##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 
+##
+## file: drivers/accessibility/Kconfig
+##
+# CONFIG_ACCESSIBILITY is not set
+
 ##
 ## file: drivers/ata/Kconfig
 ##
diff --git a/debian/config/sh4/config b/debian/config/sh4/config
index bab66983ca6f..d46ec1d7b70f 100644
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@@ -18,11 +18,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SH_FPU=y
 CONFIG_SH_STORE_QUEUES=y
 
-##
-## file: crypto/Kconfig
-##
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-
 ##
 ## file: arch/sh/drivers/Kconfig
 ##
@@ -35,6 +30,11 @@ CONFIG_HEARTBEAT=y
 CONFIG_CACHE_WRITEBACK=y
 ## end choice
 
+##
+## file: crypto/Kconfig
+##
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+
 ##
 ## file: drivers/cpufreq/Kconfig
 ##