summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-10-16 08:13:27 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-10-16 08:13:33 -0400
commitf7a31ddb047aa3d8c887f0d92622877a5a9619f3 (patch)
treea49869f2f264af1c3ea84bedba823c892507eee8
parente1f1185c48883a6a6f5e08f6f99f5fd1c7c38e08 (diff)
downloadkernel-f7a31ddb047aa3d8c887f0d92622877a5a9619f3.tar.gz
kernel-f7a31ddb047aa3d8c887f0d92622877a5a9619f3.tar.xz
kernel-f7a31ddb047aa3d8c887f0d92622877a5a9619f3.zip
Enable VIRTIO_CONSOLE as a module on all ARM (rhbz 1005551)
Matches change we did for F20 a bit ago
-rw-r--r--config-arm-generic2
-rw-r--r--config-armv71
-rw-r--r--config-armv7-lpae1
-rw-r--r--kernel.spec3
4 files changed, 5 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 21f66b0f1..32511087e 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -103,6 +103,8 @@ CONFIG_MFD_CORE=m
CONFIG_SMC91X=m
CONFIG_SMC911X=m
+CONFIG_VIRTIO_CONSOLE=m
+
# CONFIG_CRYPTO_TEST is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_XEN is not set
diff --git a/config-armv7 b/config-armv7
index 09ee753af..d91cd4385 100644
--- a/config-armv7
+++ b/config-armv7
@@ -17,7 +17,6 @@ CONFIG_ARCH_ZYNQ=y
# These are supported in the LPAE kernel
# CONFIG_ARM_LPAE is not set
# CONFIG_XEN is not set
-# CONFIG_VIRTIO_CONSOLE is not set
# CONFIG_ARM_VIRT_EXT is not set
# mvebu
diff --git a/config-armv7-lpae b/config-armv7-lpae
index f3f060de3..f2cfb02f2 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -25,7 +25,6 @@ CONFIG_ARCH_EXYNOS5=y
CONFIG_ARM_LPAE=y
CONFIG_SYS_SUPPORTS_HUGETLBFS=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_VIRTIO_CONSOLE=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_VIRTUALIZATION=y
CONFIG_ARM_SMMU=y
diff --git a/kernel.spec b/kernel.spec
index 08338b85b..bedb01c71 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2275,6 +2275,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Oct 15 2013 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable VIRTIO_CONSOLE as a module on all ARM (rhbz 1005551)
+
* Tue Oct 15 2013 Josh Boyer <jwboyer@fedoraproject.org>
- Enable IIO and various sensor options for Win8 laptops (rhbz 995510)