Adding debian version 6.8.9-1.debian/6.8.9-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 79 insertions, 220 deletions

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index bfd139e541..8dd6a4f9af 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -593,49 +593,17 @@ CONFIG_C101=m
 CONFIG_FARSYNC=m
 
 ##
-## file: drivers/net/wireless/atmel/Kconfig
-##
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-
-##
-## file: drivers/net/wireless/cisco/Kconfig
-##
-CONFIG_AIRO_CS=m
-
-##
 ## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 
 ##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-
-##
-## file: drivers/net/wireless/legacy/Kconfig
-##
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-
-##
 ## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 
 ##
-## file: drivers/net/wireless/zydas/Kconfig
-##
-CONFIG_USB_ZD1201=m
-
-##
 ## file: drivers/pcmcia/Kconfig
 ##
 CONFIG_PCCARD=m
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 8d321f203b..20188f12f0 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -218,6 +218,11 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_AMD_PMC=m
 
 ##
+## file: drivers/platform/x86/amd/pmf/Kconfig
+##
+CONFIG_AMD_PMF=m
+
+##
 ## file: drivers/platform/x86/intel/Kconfig
 ##
 CONFIG_INTEL_TPMI=m
@@ -248,6 +253,11 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SPI_PXA2XX=m
 
 ##
+## file: drivers/tee/amdtee/Kconfig
+##
+CONFIG_AMDTEE=m
+
+##
 ## file: drivers/tty/Kconfig
 ##
 CONFIG_MOXA_INTELLIO=m
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index f242e6a42f..32edca497e 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -19,7 +19,7 @@ CONFIG_ARM64_VA_BITS_48=y
 ## end choice
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=512
 CONFIG_NUMA=y
 CONFIG_XEN=y
 CONFIG_COMPAT=y
@@ -705,6 +705,13 @@ CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_XGENE=m
 
 ##
+## file: drivers/hwmon/pmbus/Kconfig
+##
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_LTC2978=m
+
+##
 ## file: drivers/hwspinlock/Kconfig
 ##
 CONFIG_HWSPINLOCK=y
@@ -1377,6 +1384,7 @@ CONFIG_WLCORE_SDIO=m
 ## file: drivers/nvmem/Kconfig
 ##
 CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_LAYERSCAPE_SFP=m
 CONFIG_NVMEM_MESON_EFUSE=m
 CONFIG_NVMEM_MTK_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
@@ -1427,6 +1435,11 @@ CONFIG_PCIE_QCOM=y
 CONFIG_PCIE_ROCKCHIP_DW_HOST=y
 
 ##
+## file: drivers/pci/controller/mobiveil/Kconfig
+##
+CONFIG_PCIE_LAYERSCAPE_GEN4=y
+
+##
 ## file: drivers/pci/hotplug/Kconfig
 ##
 CONFIG_HOTPLUG_PCI=y
@@ -1485,6 +1498,7 @@ CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHY_MIXEL_MIPI_DPHY=m
 CONFIG_PHY_FSL_IMX8M_PCIE=m
+CONFIG_PHY_FSL_LYNX_28G=m
 
 ##
 ## file: drivers/phy/hisilicon/Kconfig
@@ -1775,6 +1789,7 @@ CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_CROS_EC=m
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_MV=m
@@ -1802,6 +1817,7 @@ CONFIG_SCSI_HISI_SAS_PCI=m
 ##
 CONFIG_FSL_MC_DPIO=m
 CONFIG_DPAA2_CONSOLE=m
+CONFIG_FSL_RCPM=y
 
 ##
 ## file: drivers/soc/mediatek/Kconfig
@@ -2148,7 +2164,6 @@ CONFIG_BACKLIGHT_LED=m
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB_ARMCLCD=y
 CONFIG_FB_EFI=y
 CONFIG_FB_SIMPLE=y
 
@@ -2231,6 +2246,11 @@ CONFIG_NET_DSA=m
 CONFIG_QRTR_SMD=m
 
 ##
+## file: net/rfkill/Kconfig
+##
+CONFIG_RFKILL_GPIO=m
+
+##
 ## file: net/vmw_vsock/Kconfig
 ##
 CONFIG_HYPERV_VSOCKETS=m
@@ -2270,6 +2290,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_WCD938X_SDW=m
+CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WSA883X=m
diff --git a/debian/config/armel/config.rpi b/debian/config/armel/config.rpi
index b87c158fc6..830d29c412 100644
--- a/debian/config/armel/config.rpi
+++ b/debian/config/armel/config.rpi
@@ -1,9 +1,13 @@
 ##
 ## file: arch/arm/Kconfig
 ##
+CONFIG_VFP=y
+
+##
+## file: arch/arm/Kconfig.platforms
+##
 CONFIG_ARCH_MULTI_V6=y
 # CONFIG_ARCH_MULTI_V7 is not set
-CONFIG_VFP=y
 
 ##
 ## file: arch/arm/mach-bcm/Kconfig
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 4ece0c6129..5c5d68944b 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -2,9 +2,6 @@
 ## file: arch/arm/Kconfig
 ##
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_VIRT=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_643719=y
 CONFIG_ARM_ERRATA_754327=y
@@ -35,6 +32,13 @@ CONFIG_KERNEL_MODE_NEON=y
 # CONFIG_DEBUG_LL is not set
 
 ##
+## file: arch/arm/Kconfig.platforms
+##
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_VIRT=y
+
+##
 ## file: arch/arm/crypto/Kconfig
 ##
 CONFIG_CRYPTO_CURVE25519_NEON=m
@@ -555,6 +559,7 @@ CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_PWM_FAN=m
 
 ##
@@ -729,6 +734,7 @@ CONFIG_MEDIA_CONTROLLER=y
 ## file: drivers/media/cec/platform/Kconfig
 ##
 CONFIG_CEC_STM32=m
+CONFIG_CEC_TEGRA=m
 
 ##
 ## file: drivers/media/platform/Kconfig
@@ -741,7 +747,7 @@ CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_ASPEED=m
 
 ##
-## file: drivers/media/platform/chips-media/Kconfig
+## file: drivers/media/platform/chips-media/coda/Kconfig
 ##
 CONFIG_VIDEO_CODA=m
 
@@ -1080,6 +1086,12 @@ CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
 
 ##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
+##
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+
+##
 ## file: drivers/net/wireless/ti/Kconfig
 ##
 CONFIG_WLAN_VENDOR_TI=y
@@ -1255,6 +1267,7 @@ CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24735=m
 
 ##
 ## file: drivers/pwm/Kconfig
@@ -1612,7 +1625,6 @@ CONFIG_BACKLIGHT_GPIO=m
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB_ARMCLCD=y
 CONFIG_FB_EFI=y
 CONFIG_FB_VT8500=y
 CONFIG_FB_WM8505=y
@@ -1704,6 +1716,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 ##
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_SPDIF=y
+CONFIG_SND_SOC_WM8804_I2C=m
 
 ##
 ## file: sound/soc/fsl/Kconfig
diff --git a/debian/config/config b/debian/config/config
index ef8818a976..9d2aff2fa4 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -107,13 +107,11 @@ CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_AEGIS128=m
@@ -715,7 +713,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_LEGACY is not set
 
 ##
 ## file: drivers/gpu/drm/amd/acp/Kconfig
@@ -2013,13 +2010,10 @@ CONFIG_LEDS_TRIGGER_PATTERN=m
 ##
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
 CONFIG_MD_CLUSTER=m
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
@@ -3755,7 +3749,6 @@ CONFIG_LED_TRIGGER_PHY=y
 # CONFIG_FIXED_PHY is not set
 CONFIG_SFP=m
 CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
 # CONFIG_AX88796B_PHY is not set
 CONFIG_BROADCOM_PHY=m
 # CONFIG_BCM63XX_PHY is not set
@@ -3793,6 +3786,11 @@ CONFIG_VITESSE_PHY=m
 # CONFIG_MICREL_KS8995MA is not set
 
 ##
+## file: drivers/net/phy/aquantia/Kconfig
+##
+CONFIG_AQUANTIA_PHY=m
+
+##
 ## file: drivers/net/ppp/Kconfig
 ##
 CONFIG_PPP=m
@@ -4036,12 +4034,6 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMFMAC_PCIE=y
 
 ##
-## file: drivers/net/wireless/cisco/Kconfig
-##
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO=m
-
-##
 ## file: drivers/net/wireless/intel/Kconfig
 ##
 CONFIG_WLAN_VENDOR_INTEL=y
@@ -4078,25 +4070,6 @@ CONFIG_IWLMVM=m
 CONFIG_WLAN_VENDOR_INTERSIL=y
 
 ##
-## file: drivers/net/wireless/intersil/hostap/Kconfig
-##
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-
-##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-
-##
 ## file: drivers/net/wireless/intersil/p54/Kconfig
 ##
 CONFIG_P54_COMMON=m
@@ -4106,11 +4079,6 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI_DEFAULT_EEPROM is not set
 
 ##
-## file: drivers/net/wireless/legacy/Kconfig
-##
-CONFIG_USB_NET_RNDIS_WLAN=m
-
-##
 ## file: drivers/net/wireless/marvell/Kconfig
 ##
 CONFIG_WLAN_VENDOR_MARVELL=y
@@ -4121,7 +4089,6 @@ CONFIG_MWL8K=m
 ##
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -5121,6 +5088,7 @@ CONFIG_TCM_FC=m
 ##
 ## file: drivers/thermal/Kconfig
 ##
+CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
@@ -5153,7 +5121,7 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_IPWIRELESS=m
-CONFIG_N_GSM=m
+# CONFIG_N_GSM is not set
 CONFIG_NOZOMI=m
 
 ##
@@ -5605,8 +5573,6 @@ CONFIG_FB_ARC=m
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_I740 is not set
-# CONFIG_FB_INTEL_DEBUG is not set
-# CONFIG_FB_INTEL_I2C is not set
 CONFIG_FB_S3=m
 CONFIG_FB_S3_DDC=y
 CONFIG_FB_VIA=m
@@ -5950,13 +5916,6 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_VXFS_FS=m
 
 ##
-## file: fs/fscache/Kconfig
-##
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_DEBUG is not set
-
-##
 ## file: fs/fuse/Kconfig
 ##
 CONFIG_FUSE_FS=y
@@ -6034,6 +5993,13 @@ CONFIG_JFS_SECURITY=y
 CONFIG_MINIX_FS=m
 
 ##
+## file: fs/netfs/Kconfig
+##
+CONFIG_FSCACHE=y
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_DEBUG is not set
+
+##
 ## file: fs/nfs/Kconfig
 ##
 CONFIG_NFS_FS=m
@@ -6409,11 +6375,11 @@ CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_PC104 is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_PROFILING=y
@@ -6736,10 +6702,6 @@ CONFIG_ZBUD=y
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
-## choice: Choose SLAB allocator
-# CONFIG_SLAB_DEPRECATED is not set
-CONFIG_SLUB=y
-## end choice
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
@@ -6913,11 +6875,6 @@ CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 
 ##
-## file: net/bpfilter/Kconfig
-##
-# CONFIG_BPFILTER is not set
-
-##
 ## file: net/bridge/Kconfig
 ##
 CONFIG_BRIDGE=m
@@ -7927,6 +7884,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
 CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
@@ -8041,6 +7999,7 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_STA350 is not set
 # CONFIG_SND_SOC_STI_SAS is not set
 # CONFIG_SND_SOC_TAS2552 is not set
+CONFIG_SND_SOC_TAS2781_I2C=m
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
@@ -8153,6 +8112,11 @@ CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
 
 ##
+## file: sound/virtio/Kconfig
+##
+CONFIG_SND_VIRTIO=m
+
+##
 ## file: sound/xen/Kconfig
 ##
 CONFIG_SND_XEN_FRONTEND=m
diff --git a/debian/config/config.cloud b/debian/config/config.cloud
index 01f4afb776..1ace0f7245 100644
--- a/debian/config/config.cloud
+++ b/debian/config/config.cloud
@@ -1237,7 +1237,6 @@ CONFIG_HYPERV_STORAGE=m
 ##
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_HDLC is not set
-# CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
 
 ##
@@ -1293,8 +1292,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_CARILLO_RANCH is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 79b6152717..b7386890a5 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -298,41 +298,11 @@ CONFIG_PLIP=m
 # CONFIG_WAN is not set
 
 ##
-## file: drivers/net/wireless/atmel/Kconfig
-##
-# CONFIG_ATMEL is not set
-
-##
-## file: drivers/net/wireless/cisco/Kconfig
-##
-CONFIG_AIRO_CS=m
-
-##
 ## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 
 ##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-CONFIG_HERMES=m
-# CONFIG_PLX_HERMES is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_PCI_HERMES is not set
-CONFIG_PCMCIA_HERMES=m
-
-##
-## file: drivers/net/wireless/legacy/Kconfig
-##
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-
-##
-## file: drivers/net/wireless/zydas/Kconfig
-##
-# CONFIG_USB_ZD1201 is not set
-
-##
 ## file: drivers/parisc/Kconfig
 ##
 CONFIG_GSC=y
diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta
index be3638fb5d..e6fe1a8b14 100644
--- a/debian/config/kernelarch-mips/config.malta
+++ b/debian/config/kernelarch-mips/config.malta
@@ -224,37 +224,18 @@ CONFIG_EPIC100=m
 CONFIG_VIA_RHINE=m
 
 ##
-## file: drivers/net/wireless/atmel/Kconfig
-##
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-
-##
 ## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 
 ##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-
-##
 ## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 
 ##
-## file: drivers/net/wireless/zydas/Kconfig
-##
-CONFIG_USB_ZD1201=m
-
-##
 ## file: drivers/pci/pcie/Kconfig
 ##
 # CONFIG_PCIEPORTBUS is not set
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index de239c5ef1..ae54ccc870 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -545,39 +545,11 @@ CONFIG_WANXL=m
 CONFIG_FARSYNC=m
 
 ##
-## file: drivers/net/wireless/atmel/Kconfig
-##
-CONFIG_ATMEL=m
-# CONFIG_PCI_ATMEL is not set
-CONFIG_PCMCIA_ATMEL=m
-
-##
-## file: drivers/net/wireless/cisco/Kconfig
-##
-CONFIG_AIRO_CS=m
-
-##
 ## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 
 ##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-CONFIG_HERMES=m
-CONFIG_APPLE_AIRPORT=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-
-##
-## file: drivers/net/wireless/legacy/Kconfig
-##
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-
-##
 ## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
@@ -585,11 +557,6 @@ CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 
 ##
-## file: drivers/net/wireless/zydas/Kconfig
-##
-CONFIG_USB_ZD1201=m
-
-##
 ## file: drivers/pci/Kconfig
 ##
 CONFIG_PCI=y
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 4f3f22fb74..3431fc11e7 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1315,39 +1315,12 @@ CONFIG_WANXL=m
 CONFIG_FARSYNC=m
 
 ##
-## file: drivers/net/wireless/atmel/Kconfig
-##
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-
-##
 ## file: drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig
 ##
 #. Sony Vaio laptops
 CONFIG_BRCMFMAC_SDIO=y
 
 ##
-## file: drivers/net/wireless/cisco/Kconfig
-##
-CONFIG_AIRO_CS=m
-
-##
-## file: drivers/net/wireless/intersil/orinoco/Kconfig
-##
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-
-##
-## file: drivers/net/wireless/legacy/Kconfig
-##
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-
-##
 ## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
@@ -1356,11 +1329,6 @@ CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
 
 ##
-## file: drivers/net/wireless/zydas/Kconfig
-##
-CONFIG_USB_ZD1201=m
-
-##
 ## file: drivers/nfc/Kconfig
 ##
 CONFIG_NFC_MEI_PHY=m
@@ -1923,9 +1891,6 @@ CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 CONFIG_FB_N411=m
 CONFIG_FB_HGA=m
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_INTEL is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 5a171354f4..2678ab7cd9 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -511,7 +511,6 @@ CONFIG_BVME6000_SCSI=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
 
 ##
 ## file: drivers/tty/serial/Kconfig