diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-05-23 03:39:34 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-05-23 03:39:34 +0300 |
| commit | 2ec0028a1cadfb88d912435c1eb1ac5de76071f0 (patch) | |
| tree | b60ed6b29f5fba75d6f1c18c832aa6596a23d008 /drivers/input/rmi4 | |
| parent | 0537c8eef4f699aacdeb67c6181c66cccd63c7f5 (diff) | |
| parent | 832f54c9ccd3a3f32d1db905462d3c58b4df52bd (diff) | |
| download | linux-2ec0028a1cadfb88d912435c1eb1ac5de76071f0.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 6.10 merge window.
Diffstat (limited to 'drivers/input/rmi4')
| -rw-r--r-- | drivers/input/rmi4/rmi_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/input/rmi4/rmi_smbus.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_i2c.c b/drivers/input/rmi4/rmi_i2c.c index 091d4e23b629..3c0c5fd44702 100644 --- a/drivers/input/rmi4/rmi_i2c.c +++ b/drivers/input/rmi4/rmi_i2c.c @@ -365,7 +365,7 @@ static const struct dev_pm_ops rmi_i2c_pm = { }; static const struct i2c_device_id rmi_id[] = { - { "rmi4_i2c", 0 }, + { "rmi4_i2c" }, { } }; MODULE_DEVICE_TABLE(i2c, rmi_id); diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c index b0b099b5528a..f3d0b40721df 100644 --- a/drivers/input/rmi4/rmi_smbus.c +++ b/drivers/input/rmi4/rmi_smbus.c @@ -413,7 +413,7 @@ static const struct dev_pm_ops rmi_smb_pm = { }; static const struct i2c_device_id rmi_id[] = { - { "rmi4_smbus", 0 }, + { "rmi4_smbus" }, { } }; MODULE_DEVICE_TABLE(i2c, rmi_id); |