Merge back earlier ACPI resources management changes for v6.7.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Oct 2023 10:26:41 +0000 (12:26 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Oct 2023 10:26:41 +0000 (12:26 +0200)
1  2 
drivers/acpi/resource.c

index 297a88587031e6ebe297e2e4c231225d0f331679,014a3911381b4af987b10a3c9133e3ae239c2f2a..18f6353c142e8f18320278f7cb2fe236d8afcd1a
@@@ -502,13 -511,15 +511,9 @@@ static const struct dmi_system_id irq1_
                        DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-17A3070T"),
                },
        },
-       { }
- };
- static const struct dmi_system_id pcspecialist_laptop[] = {
        {
 -              /*
 -               * PCSpecialist Elimina Pro 16 M
 -               *
 -               * Some models have product-name "Elimina Pro 16 M",
 -               * others "GM6BGEQ". Match on board-name to match both.
 -               */
 +              /* TongFang GM6BGEQ / PCSpecialist Elimina Pro 16 M, RTX 3050 */
                .matches = {
 -                      DMI_MATCH(DMI_SYS_VENDOR, "PCSpecialist"),
                        DMI_MATCH(DMI_BOARD_NAME, "GM6BGEQ"),
                },
        },