[SRU][K][PATCH 06/16] UBUNTU: [Config] Disable CONFIG_SCSI_UFS_HWMON 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/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 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5825c60bacb0..8ec56b63e88b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -591,7 +591,6 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-# CONFIG_SCSI_UFS_HWMON is not set
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 5700acdf2ea9..fd74a9f3e920 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -615,7 +615,6 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-# CONFIG_SCSI_UFS_HWMON is not set
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 397aea89dc9f..b367d4d9c89a 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -597,7 +597,6 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-# CONFIG_SCSI_UFS_HWMON is not set
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b1b056f2b328..005be64aa9d9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9619,6 +9619,7 @@ CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
 # CONFIG_SCSI_UFS_EXYNOS is not set
 CONFIG_SCSI_UFS_HISI=m
 CONFIG_SCSI_UFS_HPB=y
+# CONFIG_SCSI_UFS_HWMON is not set
 CONFIG_SCSI_UFS_MEDIATEK=m
 CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SCSI_UFS_TI_J721E=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index dd03e5e55001..048505981c18 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -598,7 +598,6 @@ CONFIG_SCSI_SRP_ATTRS=y
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-# CONFIG_SCSI_UFS_HWMON is not set
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 69bd3166d764..bdc19fa215e2 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -587,7 +587,6 @@ CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFS_HWMON=y
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SENSORS_APDS990X=m
-- 
2.36.1