UBUNTU: [Config] CONFIG_VIRTIO_BLK=y, CONFIG_VIRTIO_NET=y for s390

BugLink: http://bugs.launchpad.net/bugs/1532886

Change these config settings to be consistent with all of the other
architectures.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

debian.master/config/amd64/config.common.amd64

@@ -440,8 +440,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/arm64/config.common.arm64

@@ -439,8 +439,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/armhf/config.common.armhf

@@ -428,8 +428,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/config.common.ubuntu

@@ -8713,10 +8713,12 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIPERBOARD_ADC=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTUALIZATION=y

debian.master/config/i386/config.common.i386

@@ -437,8 +437,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/powerpc/config.common.powerpc

@@ -436,8 +436,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m

debian.master/config/ppc64el/config.common.ppc64el

@@ -486,8 +486,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m

debian.master/config/s390x/config.common.s390x

@@ -358,8 +358,6 @@ CONFIG_UPROBES=y
 # CONFIG_UWB is not set
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VGASTATE is not set
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_NET=m
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 # CONFIG_VME_BUS is not set
 # CONFIG_VMXNET3 is not set