diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2024-12-20 15:31:19 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2024-12-20 15:31:19 +0100 |
| commit | c2db11a750fb626d0d04f2dc76e548a1f07617df (patch) | |
| tree | 01c899b2a06855633ae991f2064242f976987809 /drivers/platform/surface/surface_aggregator_cdev.c | |
| parent | 63a48181fbcddefe5fb4c6618938bb64c543945b (diff) | |
| parent | 4a077914578183ec397ad09f7156a357e00e5d72 (diff) | |
Merge branch 'locking/urgent'
Sync with urgent -- avoid conflicts.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'drivers/platform/surface/surface_aggregator_cdev.c')
| -rw-r--r-- | drivers/platform/surface/surface_aggregator_cdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c index 165b1416230d..bfaa09d1648b 100644 --- a/drivers/platform/surface/surface_aggregator_cdev.c +++ b/drivers/platform/surface/surface_aggregator_cdev.c @@ -762,7 +762,7 @@ static struct platform_device *ssam_cdev_device; static struct platform_driver ssam_cdev_driver = { .probe = ssam_dbg_device_probe, - .remove_new = ssam_dbg_device_remove, + .remove = ssam_dbg_device_remove, .driver = { .name = SSAM_CDEV_DEVICE_NAME, .probe_type = PROBE_PREFER_ASYNCHRONOUS, |