Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 6 Nov 2023 23:42:08 +0000 (15:42 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 6 Nov 2023 23:42:08 +0000 (15:42 -0800)
Prepare input updates for 6.7 merge window.

1  2 
drivers/input/touchscreen/exc3000.c

index 4c0d99aae9e0346be665ac679c17925e2291e332,654845c0cdcd79898a8b6179f9d3035e23272f40..a4030cc9ff60d7031e4f988f7446491dafcfc0ea
@@@ -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,