Message ID | 1417684490-8845-2-git-send-email-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 1b00c49..8247755 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -151,8 +151,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_USBNET=m # CONFIG_USB_UX500_DMA is not set CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_XEN=y diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index ea48a6e..fd33006 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -141,6 +141,4 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_USBNET=m CONFIG_USB_UX500_DMA=y -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y CONFIG_XEN=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 4b9cc2f..9f7c937 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -139,6 +139,4 @@ CONFIG_USB_MUSB_HDRC=y CONFIG_USB_USBNET=y # CONFIG_USB_UX500_DMA is not set # CONFIG_VFIO_IOMMU_TYPE1 is not set -# CONFIG_VIRTIO_BALLOON is not set -# CONFIG_VIRTIO_MMIO is not set # CONFIG_XEN is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 148c072..a48ea160 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7814,8 +7814,10 @@ CONFIG_VIDEO_ZORAN_LML33R10=m 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_MMIO=y 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 93ccf85..46bce29 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -149,8 +149,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_USBNET=m # CONFIG_USB_UX500_DMA is not set CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_XEN=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 145d127..d642c1b8 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -157,6 +157,4 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y CONFIG_USB_USBNET=m # CONFIG_USB_UX500_DMA is not set # CONFIG_VFIO_IOMMU_TYPE1 is not set -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index a2859b2..4a1a321 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -210,7 +210,5 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_USBNET=m CONFIG_USB_UX500_DMA=y # CONFIG_VFIO_IOMMU_TYPE1 is not set -CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MMIO=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set CONFIG_WORD_SIZE=64
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 2 -- debian.master/config/arm64/config.common.arm64 | 2 -- debian.master/config/armhf/config.common.armhf | 2 -- debian.master/config/config.common.ubuntu | 2 ++ debian.master/config/i386/config.common.i386 | 2 -- debian.master/config/powerpc/config.common.powerpc | 2 -- debian.master/config/ppc64el/config.common.ppc64el | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-)