[PATCH 5/5] UBUNTU: [Config] arm64: snapdragon: disable VIDEO_ADV7511, VIDEO_COBALT

[Paolo Pisati]

BugLink: https://bugs.launchpad.net/bugs/1797154

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64       | 2 ++
 debian.master/config/arm64/config.flavour.generic    | 2 ++
 debian.master/config/arm64/config.flavour.snapdragon | 2 ++
 debian.master/config/armhf/config.common.armhf       | 2 ++
 debian.master/config/config.common.ubuntu            | 3 ---
 debian.master/config/i386/config.common.i386         | 2 ++
 debian.master/config/ppc64el/config.common.ppc64el   | 2 ++
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 173b6f7..042d09e 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -514,6 +514,8 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VM86 is not set
 CONFIG_VME_BUS=y
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index c09c6c6..4f77482 100644
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -52,4 +52,6 @@ CONFIG_SPI_QUP=m
 CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_USB_ULPI_BUS=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 # CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index 30c744b..dfb04bd 100644
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -52,4 +52,6 @@ CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
 CONFIG_SPMI_MSM_PMIC_ARB=y
 CONFIG_USB_ULPI_BUS=y
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_COBALT is not set
 CONFIG_WCN36XX_SNAPDRAGON_HACKS=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 7815e0e..30abd24 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -531,6 +531,8 @@ CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3c6c15df..50eeef55 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9943,8 +9943,6 @@ CONFIG_VIDEO_ADV7175=m
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
 # CONFIG_VIDEO_ADV748X is not set
-CONFIG_VIDEO_ADV7511=m
-# CONFIG_VIDEO_ADV7511_CEC is not set
 CONFIG_VIDEO_ADV7604=m
 # CONFIG_VIDEO_ADV7604_CEC is not set
 CONFIG_VIDEO_ADV7842=m
@@ -9961,7 +9959,6 @@ CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_COBALT=m
 CONFIG_VIDEO_CODA=m
 CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_CS3308=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 0c9330e..6029c21 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -506,6 +506,8 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VM86=y
 CONFIG_VME_BUS=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 918f2bc..21bdd55 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -512,6 +512,8 @@ CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
-- 
2.7.4