Message ID | 1381408283-24049-2-git-send-email-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules b/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules index 71cf9ea..3002bcc 100644 --- a/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules +++ b/debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules @@ -2630,7 +2630,6 @@ videodev viperboard viperboard_adc virtio_balloon -virtio_console virtio-rng virtio_scsi virtual diff --git a/debian.master/abi/3.11.0-12.19/armhf/generic.modules b/debian.master/abi/3.11.0-12.19/armhf/generic.modules index 3926735..d38a439 100644 --- a/debian.master/abi/3.11.0-12.19/armhf/generic.modules +++ b/debian.master/abi/3.11.0-12.19/armhf/generic.modules @@ -3435,7 +3435,6 @@ videodev viperboard viperboard_adc virtio_balloon -virtio_console virtio-rng virtio_rpmsg_bus virtio_scsi diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 0465943..0c02268 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -105,6 +105,7 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VGASTATE=m +CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_MMIO=m CONFIG_WIL6210=m CONFIG_X86_MINIMUM_CPU_FAMILY=64 diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 2b5dfcb..b9bc1ca 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -77,5 +77,6 @@ CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_OHCI_HCD_PLATFORM is not set # CONFIG_VFIO_IOMMU_TYPE1 is not set +CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_MMIO=y # CONFIG_WIL6210 is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 9579c2f..bbb64a0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6807,7 +6807,6 @@ CONFIG_VIPERBOARD_ADC=m CONFIG_VIRTIO=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 3bdb3be..a6374bf 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -103,6 +103,7 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VGASTATE=m +CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_MMIO=m CONFIG_WIL6210=m CONFIG_X86_MINIMUM_CPU_FAMILY=5
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/abi/3.11.0-12.19/armhf/generic-lpae.modules | 1 - debian.master/abi/3.11.0-12.19/armhf/generic.modules | 1 - debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + 6 files changed, 3 insertions(+), 3 deletions(-)