diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-14 19:04:42 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-14 19:04:42 +0100 |
| commit | ac6f27305b591b38d13ddaab436c3fde4887ae2b (patch) | |
| tree | 05c57fff195527b28631864cdf3ffdb634658f59 /kernel-x86_64-fedora.config | |
| parent | 91b4aab5ff1cd6e2602d5b520be3a73a0643cb2c (diff) | |
| parent | e0a4f2fa8f2e52ac890f497a4e5ea596dbd97222 (diff) | |
| download | kernel-ac6f27305b591b38d13ddaab436c3fde4887ae2b.tar.gz kernel-ac6f27305b591b38d13ddaab436c3fde4887ae2b.tar.xz kernel-ac6f27305b591b38d13ddaab436c3fde4887ae2b.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc3.20210114git65f0d2414b70.125.vanilla.1.fc33
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 860b35b5e..7de460f88 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -50,15 +50,16 @@ CONFIG_ACPI_APEI=y CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BGRT=y CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_CMPC=m -CONFIG_ACPI_CONFIGFS=m +# CONFIG_ACPI_CMPC is not set +# CONFIG_ACPI_CONFIGFS is not set CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_CUSTOM_METHOD=m +# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set +# CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y -CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_EXTLOG is not set CONFIG_ACPI_FAN=y CONFIG_ACPI_HED=y @@ -71,7 +72,6 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_PROCESSOR=y -# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y @@ -1331,6 +1331,7 @@ CONFIG_DMIID=y CONFIG_DM_INIT=y CONFIG_DM_INTEGRITY=m CONFIG_DMI_SYSFS=y +CONFIG_DMI=y CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_LOG_WRITES=m CONFIG_DM_MIRROR=y @@ -1525,7 +1526,7 @@ CONFIG_DRM_VBOXVIDEO=m CONFIG_DRM_VGEM=m # CONFIG_DRM_VIA is not set CONFIG_DRM_VIRTIO_GPU=m -# CONFIG_DRM_VKMS is not set +CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_XEN is not set @@ -1679,7 +1680,7 @@ CONFIG_EEPROM_MAX6875=m # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set -# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_PCI_DMA is not set # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y |