[SRU][K][PATCH 16/16] UBUNTU: [Config] Set CONFIG_NFC_S3FWRN82_UART=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 4b2f6c759bd6..7871708f6b2b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -455,7 +455,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
-CONFIG_NFC_S3FWRN82_UART=m
 CONFIG_NFP=m
 CONFIG_NODES_SHIFT=10
 CONFIG_NOP_USB_XCEIV=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index a8b5aefd863d..c239b2bedd06 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12305,7 +12305,7 @@ CONFIG_NFC_ST_NCI_SPI                           policy<{'amd64': 'm', 'arm64': '
 CONFIG_NFC_NXP_NCI                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_NFC_NXP_NCI_I2C                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_NFC_S3FWRN5_I2C                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
-CONFIG_NFC_S3FWRN82_UART                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}>
+CONFIG_NFC_S3FWRN82_UART                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_NFC_ST95HF                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 
 # Menu: Networking support >> Networking options
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 5bf633fab2b7..c1a8058b4819 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -478,7 +478,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
-CONFIG_NFC_S3FWRN82_UART=m
 CONFIG_NFP=m
 CONFIG_NODES_SHIFT=6
 CONFIG_NOP_USB_XCEIV=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index fc5d43b61bcd..9d2ad7fbd5d2 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -464,7 +464,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
-CONFIG_NFC_S3FWRN82_UART=m
 CONFIG_NFP=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NOZOMI=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c4bcc26f688c..8873bb8086ce 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7307,6 +7307,7 @@ CONFIG_NFC_PN544_MEI=m
 CONFIG_NFC_PORT100=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_S3FWRN82_UART=m
 CONFIG_NFC_SHDLC=y
 CONFIG_NFC_SIM=m
 CONFIG_NFC_ST21NFCA=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 7f82d024b307..310ac136d3fc 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -465,7 +465,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
-CONFIG_NFC_S3FWRN82_UART=m
 CONFIG_NFP=m
 CONFIG_NODES_SHIFT=8
 CONFIG_NOP_USB_XCEIV=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index b0c8c7e586ce..78711552b0ba 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -457,7 +457,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
-# CONFIG_NFC_S3FWRN82_UART is not set
 CONFIG_NFP=m
 CONFIG_NODES_SHIFT=2
 CONFIG_NOP_USB_XCEIV=m
-- 
2.36.1