@@ -2627,13 +2627,8 @@ videobuf-vmalloc
videodev
viperboard
viperboard_adc
-virtio
virtio_balloon
-virtio_blk
virtio_console
-virtio_mmio
-virtio_net
-virtio_ring
virtio-rng
virtio_scsi
virtual
@@ -105,11 +105,7 @@ CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VGASTATE=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=y
CONFIG_WIL6210=m
CONFIG_X86_MINIMUM_CPU_FAMILY=64
CONFIG_X86_SPEEDSTEP_LIB=m
@@ -77,4 +77,5 @@ 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_MMIO=y
# CONFIG_WIL6210 is not set
@@ -32,9 +32,4 @@ CONFIG_SND_SOC_TWL6040=y
CONFIG_SPI_PXA2XX_PCI=m
CONFIG_TEGRA_HOST1X=m
CONFIG_VGASTATE=m
-CONFIG_VIRTIO=y
-# CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_BLK is not set
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_NET is not set
CONFIG_ZONE_DMA_FLAG=0
@@ -32,9 +32,4 @@ CONFIG_SND_SOC_TWL6040=m
# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_TEGRA_HOST1X is not set
# CONFIG_VGASTATE is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=m
CONFIG_ZONE_DMA_FLAG=1
@@ -6813,8 +6813,12 @@ CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
CONFIG_VIDEO_ZORAN_ZR36060=m
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
CONFIG_VIRTUALIZATION=y
CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -103,11 +103,7 @@ CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VGASTATE=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_NET=y
CONFIG_WIL6210=m
CONFIG_X86_MINIMUM_CPU_FAMILY=5
CONFIG_X86_SPEEDSTEP_LIB=y
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/abi/3.11.0-9.16/armhf/generic-lpae.modules | 5 ----- debian.master/config/amd64/config.common.amd64 | 4 ---- debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/armhf/config.flavour.generic | 5 ----- debian.master/config/armhf/config.flavour.generic-lpae | 5 ----- debian.master/config/config.common.ubuntu | 4 ++++ debian.master/config/i386/config.common.i386 | 4 ---- 7 files changed, 5 insertions(+), 23 deletions(-)