[SRU][K][PATCH 08/16] UBUNTU: [Config] Disable CONFIG_VIDEO_ZORAN 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          | 8 +-------
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 6 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 8cd104f2436f..409ccffea6d9 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -687,7 +687,6 @@ CONFIG_VFIO_IOMMU_TYPE1=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_VIRQFD=y
-# CONFIG_VIDEO_ZORAN is not set
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VMAP_STACK=y
 CONFIG_VME_BUS=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 098aaa0d89cd..44ad0428c1ec 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -719,7 +719,6 @@ CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VIDEO_TI_CAL_MC=y
-# CONFIG_VIDEO_ZORAN is not set
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VMAP_STACK=y
 CONFIG_VME_BUS=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b5265632e6df..561296ec8ce9 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -698,7 +698,6 @@ CONFIG_VFIO_IOMMU_TYPE1=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_VIRQFD=m
-# CONFIG_VIDEO_ZORAN is not set
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VMAP_STACK=y
 CONFIG_VME_BUS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index aaae05ed9ff9..f62bcc773bbd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -12801,13 +12801,7 @@ CONFIG_VIDEO_XILINX=m
 CONFIG_VIDEO_XILINX_CSI2RXSS=m
 CONFIG_VIDEO_XILINX_TPG=m
 CONFIG_VIDEO_XILINX_VTC=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=y
-CONFIG_VIDEO_ZORAN_BUZ=y
-CONFIG_VIDEO_ZORAN_DC10=y
-CONFIG_VIDEO_ZORAN_DC30=y
-CONFIG_VIDEO_ZORAN_LML33=y
-CONFIG_VIDEO_ZORAN_LML33R10=y
-CONFIG_VIDEO_ZORAN_ZR36060=y
+# CONFIG_VIDEO_ZORAN is not set
 CONFIG_VIPERBOARD_ADC=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 9ed4f8798ffa..a351d076c521 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -691,7 +691,6 @@ CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_VIRQFD=y
-# CONFIG_VIDEO_ZORAN is not set
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 10d456f18188..df06b262103b 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -681,7 +681,6 @@ CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_VIRQFD=m
-CONFIG_VIDEO_ZORAN=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VMAP_STACK is not set
 CONFIG_VME_BUS=y
-- 
2.36.1