[SRU][K][PATCH 15/16] UBUNTU: [Config] Set CONFIG_MHI_WWAN_CTRL=m on riscv64

[Emil Renner Berthing]

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 at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 2 +-
 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, 2 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 0e156a243542..4b2f6c759bd6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -376,7 +376,6 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_EP=m
-CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 7a04ae19385d..a8b5aefd863d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6932,7 +6932,7 @@ CONFIG_WILINK_PLATFORM_DATA                     policy<{'amd64': 'y', 'arm64': '
 # Menu: Device Drivers >> Network device support >> Wireless WAN >> WWAN Driver Core
 CONFIG_WWAN                                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'm', 's390x': 'n'}>
 CONFIG_WWAN_HWSIM                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
-CONFIG_MHI_WWAN_CTRL                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}>
+CONFIG_MHI_WWAN_CTRL                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_MHI_WWAN_MBIM                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_RPMSG_WWAN_CTRL                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_IOSM                                     policy<{'amd64': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 72270e7d398c..5bf633fab2b7 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -392,7 +392,6 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_EP=m
-CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MII=y
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 26d3b1d3ecec..fc5d43b61bcd 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -378,7 +378,6 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_EP=m
-CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MII=y
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ddce83712bd0..c4bcc26f688c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6401,6 +6401,7 @@ CONFIG_MFD_WM8998=y
 # CONFIG_MHI_BUS_DEBUG is not set
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MHI_WWAN_MBIM=m
 CONFIG_MHP_MEMMAP_ON_MEMORY=y
 CONFIG_MICREL_KS8995MA=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index d2c0e9de2396..7f82d024b307 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -382,7 +382,6 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_EP=m
-CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 4b4a9150e59c..b0c8c7e586ce 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -375,7 +375,6 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_EP=m
-# CONFIG_MHI_WWAN_CTRL is not set
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
-- 
2.36.1