diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-04 21:21:08 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-04 21:21:08 +0100 |
commit | 0b34da2194059656ba762f72fe31446c7cc38cc3 (patch) | |
tree | 77fe5d62deda7c1f4c75fca19288afdf2becfa00 /kernel-i686-fedora.config | |
parent | f657aa854e25eefc57bcc9f4f79683ee36c02cf2 (diff) | |
parent | 8072928de6ed1332e9515396ad441d57dde10378 (diff) | |
download | kernel-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-i686-fedora.config')
-rw-r--r-- | kernel-i686-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index fc0950138..9c4ecd1c0 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -898,6 +898,8 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_PERCENTAGE 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=m @@ -1477,7 +1479,6 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set CONFIG_DRM_PANEL_VISIONOX_RM69299=m -# CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set CONFIG_DRM_PANEL=y # CONFIG_DRM_PARADE_PS8622 is not set |