summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-10-22 13:09:06 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-10-22 13:09:06 -0400
commit1db147171ed444acf9f7e02a7dddd90957d89243 (patch)
treeff2614fdfd62036dde86a6ba21b8f46e4179b40b
parentfd8747005aa28f3d284cfd616e7bfd05d9136995 (diff)
downloadkernel-1db147171ed444acf9f7e02a7dddd90957d89243.tar.gz
kernel-1db147171ed444acf9f7e02a7dddd90957d89243.tar.xz
kernel-1db147171ed444acf9f7e02a7dddd90957d89243.zip
Build virtio drivers as modules (rhbz 1019569)
-rw-r--r--config-generic4
-rw-r--r--config-s390x1
-rw-r--r--kernel.spec3
3 files changed, 6 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 861ac1b00..2892f507b 100644
--- a/config-generic
+++ b/config-generic
@@ -348,13 +348,13 @@ CONFIG_BLK_DEV_THROTTLING=y
CONFIG_SCSI_VIRTIO=m
CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MMIO=m
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_NET=m
CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=m
CONFIG_VHOST_NET=m
CONFIG_TCM_VHOST=m
CONFIG_VHOST_SCSI=m
diff --git a/config-s390x b/config-s390x
index b4c95a552..c81b679e6 100644
--- a/config-s390x
+++ b/config-s390x
@@ -194,6 +194,7 @@ CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
# CONFIG_KVM_S390_UCONTROL is not set
CONFIG_S390_GUEST=y
+CONFIG_VIRTIO_CONSOLE=y
CONFIG_MEMORY_HOTPLUG=y
diff --git a/kernel.spec b/kernel.spec
index 9dc64d489..b12d2d339 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2259,6 +2259,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Oct 22 2013 Josh Boyer <jwboyer@fedoraproject.org>
+- Build virtio drivers as modules (rhbz 1019569)
+
* Tue Oct 22 2013 Adam Jackson <ajax@redhat.com>
- Drop voodoo1 fbdev driver