@@ -691,7 +691,6 @@ CONFIG_VXGE=m
CONFIG_W1=m
CONFIG_WAN=y
CONFIG_WDTPCI=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WWAN=y
CONFIG_X25=m
CONFIG_XEN=y
@@ -6619,10 +6619,10 @@ CONFIG_AT76C50X_USB policy<{'amd64': 'm', 'arm64': '
CONFIG_WLAN_VENDOR_CISCO policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
CONFIG_AIRO policy<{'amd64': 'm', 'ppc64el': 'm'}>
CONFIG_AIRO_CS policy<{'amd64': 'm'}>
-CONFIG_WLAN_VENDOR_MICROCHIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n'}>
-CONFIG_WILC1000_SDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_WILC1000_SPI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_WILC1000_HW_OOB_INTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
+CONFIG_WLAN_VENDOR_MICROCHIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
+CONFIG_WILC1000_SDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
+CONFIG_WILC1000_SPI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
+CONFIG_WILC1000_HW_OOB_INTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
CONFIG_WLAN_VENDOR_RALINK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
CONFIG_WLAN_VENDOR_RSI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
CONFIG_WLAN_VENDOR_ST policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
@@ -723,7 +723,6 @@ CONFIG_VXGE=m
CONFIG_W1=m
CONFIG_WAN=y
CONFIG_WDTPCI=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WWAN=y
CONFIG_X25=m
CONFIG_XEN=y
@@ -704,7 +704,6 @@ CONFIG_VXGE=m
CONFIG_W1=m
CONFIG_WAN=y
CONFIG_WDTPCI=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WWAN=y
CONFIG_X25=m
# CONFIG_XEN is not set
@@ -12982,6 +12982,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
CONFIG_WLAN_VENDOR_INTERSIL=y
CONFIG_WLAN_VENDOR_MARVELL=y
CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WLAN_VENDOR_PURELIFI=y
CONFIG_WLAN_VENDOR_QUANTENNA=y
CONFIG_WLAN_VENDOR_RALINK=y
@@ -694,7 +694,6 @@ CONFIG_VXGE=m
CONFIG_W1=m
CONFIG_WAN=y
CONFIG_WDTPCI=m
-CONFIG_WLAN_VENDOR_MICROCHIP=y
CONFIG_WWAN=y
CONFIG_X25=m
CONFIG_XILINX_EMACLITE=m
@@ -686,7 +686,6 @@ CONFIG_VXGE=m
CONFIG_W1=m
CONFIG_WAN=y
CONFIG_WDTPCI=m
-# CONFIG_WLAN_VENDOR_MICROCHIP is not set
CONFIG_WWAN=m
CONFIG_X25=m
CONFIG_XILINX_EMACLITE=m
BugLink: https://bugs.launchpad.net/bugs/1981437 This option was not annotated in the linux-riscv tree, so let's align it with the other architectures. Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 8 ++++---- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - 7 files changed, 5 insertions(+), 9 deletions(-)