diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 a3352a436..f54e6fbcd 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 a7586a4db142..c2a7e30e2143 100644 +index 455966401102..5cb0d548ec25 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 */ |