diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-27 19:11:06 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-27 19:11:06 +0100 |
commit | 81ab2c0bf4261b65fba1d8c916b902ef22146cc6 (patch) | |
tree | e3f2e92958afb609a13b3da433d157b5b5c363bf /kernel-s390x-rhel.config | |
parent | 9ae896490720dd5cd709110f6391e0c85e06e5ff (diff) | |
parent | b0adfd4b4f0981efd2bf936bb3be4e0e005607df (diff) | |
download | kernel-81ab2c0bf4261b65fba1d8c916b902ef22146cc6.tar.gz kernel-81ab2c0bf4261b65fba1d8c916b902ef22146cc6.tar.xz kernel-81ab2c0bf4261b65fba1d8c916b902ef22146cc6.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc34kernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc33kernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index cfadae9da..91fece993 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3833,7 +3833,7 @@ CONFIG_PINCTRL_ALDERLAKE=m # CONFIG_PINCTRL_BROXTON is not set # CONFIG_PINCTRL_CHERRYVIEW is not set CONFIG_PINCTRL_ELKHARTLAKE=m -# CONFIG_PINCTRL_EMMITSBURG is not set +CONFIG_PINCTRL_EMMITSBURG=m # CONFIG_PINCTRL_EQUILIBRIUM is not set CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ4019 is not set @@ -6083,7 +6083,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y # CONFIG_VIRTIO_FS is not set CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set |