diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-12-13 11:53:27 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-12-13 11:53:27 -0300 |
| commit | aec95d7ce1c8fe5ee9940b861b53e31509ce9428 (patch) | |
| tree | 95d52689401dc3b3547134b2f2c04f03e1a5b933 /arch/arm/common/scoop.c | |
| parent | 1d18ebcfd302a2005b83ae5f13df223894d19902 (diff) | |
| parent | f932fb9b40749d1c9a539d89bb3e288c077aafe5 (diff) | |
| download | linux-aec95d7ce1c8fe5ee9940b861b53e31509ce9428.tar.gz linux-aec95d7ce1c8fe5ee9940b861b53e31509ce9428.tar.bz2 linux-aec95d7ce1c8fe5ee9940b861b53e31509ce9428.zip | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To get the fixes that went thru perf-tools for v6.13.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 9018c7240166..0b08b6621878 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -250,7 +250,7 @@ static void scoop_remove(struct platform_device *pdev) static struct platform_driver scoop_driver = { .probe = scoop_probe, - .remove_new = scoop_remove, + .remove = scoop_remove, .suspend = scoop_suspend, .resume = scoop_resume, .driver = { |