diff options
| author | Mark Brown <broonie@kernel.org> | 2024-12-03 22:00:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-12-03 22:04:07 +0000 |
| commit | c41da3a620e611b16b62a5cf93168caf01252fc4 (patch) | |
| tree | 96115ba290db6ea1809507635d4e009a4790ee71 /arch/um/drivers/rtc_kern.c | |
| parent | 31823f27f84bfa06be20f98ec9be63a671307d63 (diff) | |
| parent | cdd30ebb1b9f36159d66f088b61aee264e649d7a (diff) | |
ASoC: Merge up origin to resolve interaction with manline symbol changes
Commit cdd30ebb1b9f ("module: Convert symbol namespace to string
literal") changes the arguments for various module symbol macros
including some that we've aded new uses for. Merge the commit up to
avoid problems in -next.
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'arch/um/drivers/rtc_kern.c')
| -rw-r--r-- | arch/um/drivers/rtc_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/rtc_kern.c b/arch/um/drivers/rtc_kern.c index 3a1582219c4b..134a58f93c85 100644 --- a/arch/um/drivers/rtc_kern.c +++ b/arch/um/drivers/rtc_kern.c @@ -176,7 +176,7 @@ static void uml_rtc_remove(struct platform_device *pdev) static struct platform_driver uml_rtc_driver = { .probe = uml_rtc_probe, - .remove_new = uml_rtc_remove, + .remove = uml_rtc_remove, .driver = { .name = "uml-rtc", }, |