summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-11-19 13:24:16 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-11-19 13:24:16 -0500
commit57c5ca56f444123e767a4b948fc1a62542d63e93 (patch)
tree4271dce7131ac4416584634556b755bcaf2398de
parent94b9cdb4e60eceaf54ec00f54292733abdc5fd44 (diff)
downloadkernel-57c5ca56f444123e767a4b948fc1a62542d63e93.tar.gz
kernel-57c5ca56f444123e767a4b948fc1a62542d63e93.tar.xz
kernel-57c5ca56f444123e767a4b948fc1a62542d63e93.zip
Disable SERIAL_8250 on s390x (rhbz 1158848)
-rw-r--r--config-s390x1
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x
index fd9e28dc6..a76cad62b 100644
--- a/config-s390x
+++ b/config-s390x
@@ -233,6 +233,7 @@ CONFIG_HOTPLUG_PCI_S390=y
# CONFIG_HID is not set
# CONFIG_MTD is not set
+# CONFIG_SERIAL_8250 is not set
# CONFIG_PARPORT is not set
# CONFIG_UWB is not set
# CONFIG_MMC is not set
diff --git a/kernel.spec b/kernel.spec
index dbf87e242..f563d95a0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2205,6 +2205,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Nov 19 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable SERIAL_8250 on s390x (rhbz 1158848)
+
* Mon Nov 17 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc5.git0.2
- Re-merge kernel-arm64.patch