summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-01 10:57:09 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-01 10:57:09 +0200
commit240337c708d721f0f8ac44bef6f4b33d21731e58 (patch)
tree005b4b65470cbcf30db5cb0bf36a430400d7abfd
parent01e1c5521b2c1c4074cd83cd4e4c4604309ce518 (diff)
parent43bd09fbb8c0d213f57173222fa0132636f78403 (diff)
downloadkernel-240337c708d721f0f8ac44bef6f4b33d21731e58.tar.gz
kernel-240337c708d721f0f8ac44bef6f4b33d21731e58.tar.xz
kernel-240337c708d721f0f8ac44bef6f4b33d21731e58.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE1
-rw-r--r--configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE1
-rw-r--r--configs/fedora/generic/x86/CONFIG_ACPI_TABLE_UPGRADE1
4 files changed, 2 insertions, 2 deletions
diff --git a/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE b/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
new file mode 100644
index 000000000..3ac21bf3a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
@@ -0,0 +1 @@
+# CONFIG_ACPI_TABLE_UPGRADE is not set
diff --git a/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS b/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
new file mode 100644
index 000000000..7a9c706fb
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
@@ -0,0 +1 @@
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE b/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE
deleted file mode 100644
index 276233fba..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_TABLE_UPGRADE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_TABLE_UPGRADE=y
diff --git a/configs/fedora/generic/x86/CONFIG_ACPI_TABLE_UPGRADE b/configs/fedora/generic/x86/CONFIG_ACPI_TABLE_UPGRADE
deleted file mode 100644
index 276233fba..000000000
--- a/configs/fedora/generic/x86/CONFIG_ACPI_TABLE_UPGRADE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_TABLE_UPGRADE=y