diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
| commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
| tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch | |
| parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
| parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
| download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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.patch | 2 |
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 */ |