diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
| commit | b16f4ddd7e5422a842beaeaeea0c411bd432d0f4 (patch) | |
| tree | 3268a5a64dd96a1ebc80d1af24cdaa093d496385 /0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | |
| parent | d5e4e88fb9466ff04a7cd07c1ae8323bbbc36b8b (diff) | |
| parent | 95dc4cf28c756d993d2080a495935006100a62a2 (diff) | |
| download | kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31.tar.gz kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31.tar.xz kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch index e188b5a2d..48c4e0620 100644 --- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch +++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch @@ -39,10 +39,10 @@ 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 a100483b47c4..29f693734edb 100644 +index 46ec402e97ed..be65df48588f 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c -@@ -39,7 +39,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ +@@ -40,7 +40,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ EXPORT_SYMBOL(acpi_pci_disabled); static bool param_acpi_off __initdata; |