diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-27 19:48:54 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-27 19:48:54 +0200 |
| commit | be305682f0f037608ba1884e677c56d30877d699 (patch) | |
| tree | 53a33b12b4434182720920a9da81e27d2d40c7ed /0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch | |
| parent | 8646321dee2344a7d6b8c53bc1694c23d6992fe8 (diff) | |
| parent | 13bd6da63cf611a8325774f77a657cf8a6a0fc66 (diff) | |
| download | kernel-be305682f0f037608ba1884e677c56d30877d699.tar.gz kernel-be305682f0f037608ba1884e677c56d30877d699.tar.xz kernel-be305682f0f037608ba1884e677c56d30877d699.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.20200827git15bc20c6af4c.1.vanilla.2.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 a6868a946..fffb15cba 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 5cb0d548ec25..999f0a232e57 100644 +index 2e4ba374ab54..7630e22e1722 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 */ |