From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 26 Oct 2023 10:26:41 +0000 (+0200)
Subject: Merge back earlier ACPI resources management changes for v6.7.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=78fdccdc8b9f941d6575625c625f2f4e86db53ce;p=linux.git

Merge back earlier ACPI resources management changes for v6.7.
---

78fdccdc8b9f941d6575625c625f2f4e86db53ce
diff --cc drivers/acpi/resource.c
index 297a88587031e,014a3911381b4..18f6353c142e8
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@@ -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"),
  		},
  	},