summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-03-04 21:21:08 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-03-04 21:21:08 +0100
commit0b34da2194059656ba762f72fe31446c7cc38cc3 (patch)
tree77fe5d62deda7c1f4c75fca19288afdf2becfa00 /kernel-x86_64-rhel.config
parentf657aa854e25eefc57bcc9f4f79683ee36c02cf2 (diff)
parent8072928de6ed1332e9515396ad441d57dde10378 (diff)
downloadkernel-0b34da2194059656ba762f72fe31446c7cc38cc3.tar.gz
kernel-0b34da2194059656ba762f72fe31446c7cc38cc3.tar.xz
kernel-0b34da2194059656ba762f72fe31446c7cc38cc3.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc1.20210304gitf69d02e37a85.163.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-rhel.config')
-rw-r--r--kernel-x86_64-rhel.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index db881a4e1..0370fdef1 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -712,8 +712,9 @@ CONFIG_CMA_AREAS=7
# CONFIG_CMA_DEBUGFS is not set
# CONFIG_CMA_DEBUG is not set
# CONFIG_CMA is not set
-CONFIG_CMDLINE=""
# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
# CONFIG_CMDLINE_PARTITION is not set
CONFIG_CNIC=m
# CONFIG_CODA_FS is not set
@@ -1277,7 +1278,6 @@ CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
-# CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
# CONFIG_DRM_PANFROST is not set
# CONFIG_DRM_PARADE_PS8622 is not set
# CONFIG_DRM_PARADE_PS8640 is not set