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/pcap_ts.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/pcap_ts.c')
-rw-r--r-- | drivers/input/touchscreen/pcap_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c index 821245019fea..083206a3457b 100644 --- a/drivers/input/touchscreen/pcap_ts.c +++ b/drivers/input/touchscreen/pcap_ts.c @@ -238,7 +238,7 @@ static const struct dev_pm_ops pcap_ts_pm_ops = { static struct platform_driver pcap_ts_driver = { .probe = pcap_ts_probe, - .remove_new = pcap_ts_remove, + .remove = pcap_ts_remove, .driver = { .name = "pcap-ts", .pm = PCAP_TS_PM_OPS, |