[PATCH 2/2] UBUNTU: [Config] i386: amd64: VIRTIO_CONSOLE=y

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/abi/3.13.0-0.5/amd64/generic.modules | 1 -
 debian.master/abi/3.13.0-0.5/i386/generic.modules  | 1 -
 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/i386/config.common.i386       | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian.master/abi/3.13.0-0.5/amd64/generic.modules b/debian.master/abi/3.13.0-0.5/amd64/generic.modules
index 3cd7370..9f35201 100644
--- a/debian.master/abi/3.13.0-0.5/amd64/generic.modules
+++ b/debian.master/abi/3.13.0-0.5/amd64/generic.modules
@@ -3618,7 +3618,6 @@ videocodec
 videodev
 viperboard
 viperboard_adc
-virtio_console
 virtio-rng
 virtio_scsi
 virtual
diff --git a/debian.master/abi/3.13.0-0.5/i386/generic.modules b/debian.master/abi/3.13.0-0.5/i386/generic.modules
index c061b25..9284188 100644
--- a/debian.master/abi/3.13.0-0.5/i386/generic.modules
+++ b/debian.master/abi/3.13.0-0.5/i386/generic.modules
@@ -3767,7 +3767,6 @@ videocodec
 videodev
 viperboard
 viperboard_adc
-virtio_console
 virtio-rng
 virtio_scsi
 virtual
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 1f7f19b..523a356 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -117,7 +117,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIRTIO_CONSOLE=m
 CONFIG_WIL6210=m
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIRELESS=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 3d86645..f6854ea 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -69,7 +69,6 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VGA_CONSOLE is not set
-CONFIG_VIRTIO_CONSOLE=y
 CONFIG_WIMAX_GDM72XX_SDIO=y
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 48b5e83b..fefb665 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -90,7 +90,6 @@ CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
-CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_WIL6210 is not set
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIRELESS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3b4b56b..0627f82 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6839,6 +6839,7 @@ CONFIG_VIPERBOARD_ADC=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_NET=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 836e42e..569f566 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -115,7 +115,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIRTIO_CONSOLE=m
 CONFIG_WIL6210=m
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIRELESS=y
-- 
1.8.3.2