diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-11-24 17:05:27 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-11-24 17:05:27 -0800 |
| commit | 0201710ba6308a61f1a775c418fe74b8a31ace08 (patch) | |
| tree | 4ba8de26ade82869bce1014f1ab19207ec070548 /drivers/input/touchscreen/ti_am335x_tsc.c | |
| parent | 5c822c0ce5cc83ed4cd8394f3dc46dae8d9a681d (diff) | |
| parent | 04337738629e8020c272c0dfcd56b9ae0a55ce98 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.13 merge window.
Diffstat (limited to 'drivers/input/touchscreen/ti_am335x_tsc.c')
| -rw-r--r-- | drivers/input/touchscreen/ti_am335x_tsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 294b7ceded27..93d659ff90aa 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -550,9 +550,9 @@ MODULE_DEVICE_TABLE(of, ti_tsc_dt_ids); static struct platform_driver ti_tsc_driver = { .probe = titsc_probe, - .remove_new = titsc_remove, + .remove = titsc_remove, .driver = { - .name = "TI-am335x-tsc", + .name = "TI-am335x-tsc", .pm = pm_sleep_ptr(&titsc_pm_ops), .of_match_table = ti_tsc_dt_ids, }, |