[kernel/f20] Build virtio drivers as modules (rhbz 1019569)

[Josh Boyer]

commit d58808f719a284cfa9dd692b1c4a25973b3a24b4
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Tue Oct 22 13:09:06 2013 -0400

    Build virtio drivers as modules (rhbz 1019569)

 config-generic |    4 ++--
 config-s390x   |    1 +
 kernel.spec    |    3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/config-generic b/config-generic
index 5703ae9..af9f3b1 100644
--- a/config-generic
+++ b/config-generic
@@ -343,13 +343,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 a292f42..32fbecc 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 fe73500..e053221 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2350,6 +2350,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Oct 22 2013 Josh Boyer <jwboyer at fedoraproject.org>
+- Build virtio drivers as modules (rhbz 1019569)
+
 * Tue Oct 22 2013 Adam Jackson <ajax at redhat.com>
 - Drop voodoo1 fbdev driver