diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-06-26 15:18:13 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-06-26 15:18:13 -0700 |
| commit | bf4ed21778f2920ca91a32fd3a1e1130e843e98f (patch) | |
| tree | efb126e6d74ff3ff83913406de136305050c8a80 /drivers/input/misc/cma3000_d0x_i2c.c | |
| parent | feee70f4568650cf44c573488798ffc0a2faeea3 (diff) | |
| parent | 8c9cce9cb81b5fdc6e66bf3f129727b89e8daab7 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.5 merge window.
Diffstat (limited to 'drivers/input/misc/cma3000_d0x_i2c.c')
| -rw-r--r-- | drivers/input/misc/cma3000_d0x_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/cma3000_d0x_i2c.c b/drivers/input/misc/cma3000_d0x_i2c.c index 136eb3715870..a4dfb3052dc0 100644 --- a/drivers/input/misc/cma3000_d0x_i2c.c +++ b/drivers/input/misc/cma3000_d0x_i2c.c @@ -97,7 +97,7 @@ static const struct i2c_device_id cma3000_i2c_id[] = { MODULE_DEVICE_TABLE(i2c, cma3000_i2c_id); static struct i2c_driver cma3000_i2c_driver = { - .probe_new = cma3000_i2c_probe, + .probe = cma3000_i2c_probe, .remove = cma3000_i2c_remove, .id_table = cma3000_i2c_id, .driver = { |