From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 6 Nov 2023 23:42:08 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cdd5b5a9761fd66d17586e4f4ba6588c70e640ea;p=linux.git

Merge branch 'next' into for-linus

Prepare input updates for 6.7 merge window.
---

cdd5b5a9761fd66d17586e4f4ba6588c70e640ea
diff --cc drivers/input/touchscreen/exc3000.c
index 4c0d99aae9e03,654845c0cdcd7..a4030cc9ff60d
--- a/drivers/input/touchscreen/exc3000.c
+++ b/drivers/input/touchscreen/exc3000.c
@@@ -473,8 -457,8 +466,9 @@@ MODULE_DEVICE_TABLE(acpi, exc3000_acpi_
  static struct i2c_driver exc3000_driver = {
  	.driver = {
  		.name	= "exc3000",
+ 		.dev_groups = exc3000_groups,
  		.of_match_table = of_match_ptr(exc3000_of_match),
 +		.acpi_match_table = ACPI_PTR(exc3000_acpi_match),
  	},
  	.id_table	= exc3000_id,
  	.probe		= exc3000_probe,