From d52ba7f67a32926e318e0c7d415f19a6a5db9a61 Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Sun, 24 Jun 2012 22:39:13 +0000 Subject: [PATCH] disable virtio on all armel platforms except versatile svn path=/dists/trunk/linux/; revision=19203 --- debian/changelog | 1 + debian/config/armel/config | 10 ++++++++++ debian/config/armel/config.versatile | 10 ++++++++++ 3 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index ac385b6c6..f596da82e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux (3.4.3-1~experimental.1) UNRELEASED; urgency=low [ Arnaud Patard ] * [armel] disable FIPS, VGA_ARB, FTRACE on iop32x and ixp4xx to reduce kernel size. + * [armel] disable virtio modules on all platforms except versatile -- Ben Hutchings Thu, 07 Jun 2012 04:45:03 +0100 diff --git a/debian/config/armel/config b/debian/config/armel/config index 3cf7e9ee3..352f259bd 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -56,6 +56,10 @@ CONFIG_YAM=m #. Causes lockups on ARM (see #588164) # CONFIG_PARPORT_PC is not set +## +## file: drivers/pci/Kconfig +# CONFIG_PCI_IOV is not set + ## ## file: drivers/scsi/Kconfig ## @@ -114,3 +118,9 @@ CONFIG_KERNEL_LZMA=y ## # CONFIG_SECURITY_TOMOYO is not set +## +## file: drivers/virtio/Kconfig +## +# CONFIG_VIRTIO_PCI is not set +# CONFIG_VIRTIO_BALLOON is not set + diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index aba3754e5..4779546ee 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -339,6 +339,10 @@ CONFIG_BROADCOM_PHY=m CONFIG_ICPLUS_PHY=m # CONFIG_MDIO_BITBANG is not set +## +## file: drivers/pci/Kconfig +CONFIG_PCI_IOV=y + ## ## file: drivers/pcmcia/Kconfig ## @@ -455,6 +459,12 @@ CONFIG_FONT_8x16=y ## CONFIG_DISPLAY_SUPPORT=m +## +## file: drivers/virtio/Kconfig +## +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y + ## ## file: kernel/Kconfig.preempt ##