summaryrefslogtreecommitdiff
path: root/drivers/acpi/resource.c
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2025-02-18 09:43:43 +0300
committerThomas Zimmermann <tzimmermann@suse.de>2025-02-18 09:43:43 +0300
commit8bd1a8e7572c1012b19e4f57e2f49451820167ef (patch)
treed3e324f78d3b3bb7cf244be9c09ee463afd0ff7e /drivers/acpi/resource.c
parentb296955b3a740ecc8b3b08e34fd64f1ceabb8fb4 (diff)
parent0ed1356af8f629ae807963b7db4e501e3b580bc2 (diff)
downloadlinux-8bd1a8e7572c1012b19e4f57e2f49451820167ef.tar.xz
Merge drm/drm-next into drm-misc-next
Backmerging to get bugfixes from v6.14-rc2. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/acpi/resource.c')
-rw-r--r--drivers/acpi/resource.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 90aaec923889..b4cd14e7fa76 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -564,6 +564,12 @@ static const struct dmi_system_id irq1_edge_low_force_override[] = {
},
},
{
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Eluktronics Inc."),
+ DMI_MATCH(DMI_BOARD_NAME, "MECH-17"),
+ },
+ },
+ {
/* TongFang GM6XGxX/TUXEDO Stellaris 16 Gen5 AMD */
.matches = {
DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"),