summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2024-05-22 17:39:34 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2024-05-22 17:39:34 -0700
commit2ec0028a1cadfb88d912435c1eb1ac5de76071f0 (patch)
treeb60ed6b29f5fba75d6f1c18c832aa6596a23d008 /drivers/input/serio
parent0537c8eef4f699aacdeb67c6181c66cccd63c7f5 (diff)
parent832f54c9ccd3a3f32d1db905462d3c58b4df52bd (diff)
downloadlinux-stable-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.tar.gz
linux-stable-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.tar.bz2
linux-stable-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.zip
Merge branch 'next' into for-linus
Prepare input updates for 6.10 merge window.
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/ioc3kbd.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/serio/ioc3kbd.c b/drivers/input/serio/ioc3kbd.c
index 50552dc7b4f5..676b0bda3d72 100644
--- a/drivers/input/serio/ioc3kbd.c
+++ b/drivers/input/serio/ioc3kbd.c
@@ -200,9 +200,16 @@ static void ioc3kbd_remove(struct platform_device *pdev)
serio_unregister_port(d->aux);
}
+static const struct platform_device_id ioc3kbd_id_table[] = {
+ { "ioc3-kbd", },
+ { }
+};
+MODULE_DEVICE_TABLE(platform, ioc3kbd_id_table);
+
static struct platform_driver ioc3kbd_driver = {
.probe = ioc3kbd_probe,
.remove_new = ioc3kbd_remove,
+ .id_table = ioc3kbd_id_table,
.driver = {
.name = "ioc3-kbd",
},