diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
| commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
| tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | |
| parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
| parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
| download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-acpi-prefer-booting-with-ACPI-over-DTS.patch')
| -rw-r--r-- | 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch index 48c4e0620..a3352a436 100644 --- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch +++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch @@ -39,7 +39,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index 46ec402e97ed..be65df48588f 100644 +index a7586a4db142..c2a7e30e2143 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -40,7 +40,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ |