From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 18 Aug 2022 07:44:26 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5e92a64bd0bbb83e4a522c8be943963a29d4f9e1;p=linux.git

Merge branch 'for-linus' into for-next
---

5e92a64bd0bbb83e4a522c8be943963a29d4f9e1
diff --cc drivers/platform/x86/serial-multi-instantiate.c
index 67feed25c9dbc,e98007197cf52..5362f1a7b77c5
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@@ -324,10 -325,11 +324,11 @@@ static const struct smi_node cs35l41_hd
  static const struct acpi_device_id smi_acpi_ids[] = {
  	{ "BSG1160", (unsigned long)&bsg1160_data },
  	{ "BSG2150", (unsigned long)&bsg2150_data },
 -	{ "INT3515", (unsigned long)&int3515_data },
  	{ "CSC3551", (unsigned long)&cs35l41_hda },
 +	{ "INT3515", (unsigned long)&int3515_data },
  	/* Non-conforming _HID for Cirrus Logic already released */
  	{ "CLSA0100", (unsigned long)&cs35l41_hda },
+ 	{ "CLSA0101", (unsigned long)&cs35l41_hda },
  	{ }
  };
  MODULE_DEVICE_TABLE(acpi, smi_acpi_ids);