summaryrefslogtreecommitdiffstats
path: root/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
commit8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (patch)
treee2baee2da7d349311c64f206a6a3dd6eb8935211 /0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
parent430af957008fa73bd81840a407110ed7a979ae02 (diff)
downloadkernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.gz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.xz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.zip
kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch')
-rw-r--r--0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
index 81e39232b..2c767b464 100644
--- a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
+++ b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
@@ -16,7 +16,7 @@ CC: Mark Salter <msalter@redhat.com>
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index 2e4ba374ab54..7630e22e1722 100644
+index 5cb0d548ec25..999f0a232e57 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -40,7 +40,11 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */