diff options
| author | Laura Abbott <labbott@redhat.com> | 2018-07-30 11:48:33 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2018-08-01 17:38:43 +0100 |
| commit | 7c800e431f5c61d4f8a283dc3840e6ebba9caf4b (patch) | |
| tree | e4cfe6baa6e05167a28a8d6cb5809da10b7763a4 | |
| parent | 2964bf6887b1744f31dc32226ab08f3abf2de613 (diff) | |
| download | kernel-7c800e431f5c61d4f8a283dc3840e6ebba9caf4b.tar.gz kernel-7c800e431f5c61d4f8a283dc3840e6ebba9caf4b.tar.xz kernel-7c800e431f5c61d4f8a283dc3840e6ebba9caf4b.zip | |
Disable framebuffer takeover on s390 again due to more build failures
| -rw-r--r-- | configs/fedora/generic/s390x/CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER | 1 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 |
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 a21ad960c..124a86dfd 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 b3e8f2b55..98406e3c9 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 |