e44e60b290
Resolved merge conflict in the following patches: layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch Refreshed patches, removed upstreamed patch: bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch Run tested: qemu-x86-64 Build tested: x86/64 Signed-off-by: Petr Štetiar <ynezz@true.cz>
20 lines
497 B
Diff
20 lines
497 B
Diff
--- a/arch/x86/kernel/reboot.c
|
|
+++ b/arch/x86/kernel/reboot.c
|
|
@@ -477,6 +477,16 @@ static const struct dmi_system_id reboot
|
|
},
|
|
},
|
|
|
|
+ /* PC Engines */
|
|
+ { /* Handle problems with rebooting on PC Engines apu2 */
|
|
+ .callback = set_pci_reboot,
|
|
+ .ident = "PC Engines apu2",
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_BOARD_VENDOR, "PC Engines"),
|
|
+ DMI_MATCH(DMI_BOARD_NAME, "apu2"),
|
|
+ },
|
|
+ },
|
|
+
|
|
/* Sony */
|
|
{ /* Handle problems with rebooting on Sony VGN-Z540N */
|
|
.callback = set_bios_reboot,
|