summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2018-07-30 11:48:33 -0700
committerLaura Abbott <labbott@redhat.com>2018-07-30 11:48:33 -0700
commit0256b7c58a87eb78d9921e675abb285ffb09d48a (patch)
tree568489235d1428033d8f6099f1cf4cffca08d8ee
parent80c9c37cba822ef2b789ea43b8ecbce79a3b1af5 (diff)
downloadkernel-0256b7c58a87eb78d9921e675abb285ffb09d48a.tar.gz
kernel-0256b7c58a87eb78d9921e675abb285ffb09d48a.tar.xz
kernel-0256b7c58a87eb78d9921e675abb285ffb09d48a.zip
Disable framebuffer takeover on s390 due to build failure
-rw-r--r--configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER1
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
3 files changed, 3 insertions, 2 deletions
diff --git a/configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER b/configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
new file mode 100644
index 000000000..91eda6cd3
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
@@ -0,0 +1 @@
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 118479d15..eb9cd397d 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1517,7 +1517,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
CONFIG_FPGA_MGR_XILINX_SPI=m
CONFIG_FPGA_MGR_ZYNQ_FPGA=m
CONFIG_FPGA_REGION=m
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FRAMEBUFFER_CONSOLE=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e4251036c..bc0c1c9a9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1496,7 +1496,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
CONFIG_FPGA_MGR_XILINX_SPI=m
CONFIG_FPGA_MGR_ZYNQ_FPGA=m
CONFIG_FPGA_REGION=m
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FRAMEBUFFER_CONSOLE=y