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 /drivers/platform/surface/surface_aggregator_registry.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 'drivers/platform/surface/surface_aggregator_registry.c')
-rw-r--r-- | drivers/platform/surface/surface_aggregator_registry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c index 06e45f0b9817..d4f32ad66530 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -554,7 +554,7 @@ static void ssam_platform_hub_remove(struct platform_device *pdev) static struct platform_driver ssam_platform_hub_driver = { .probe = ssam_platform_hub_probe, - .remove_new = ssam_platform_hub_remove, + .remove = ssam_platform_hub_remove, .driver = { .name = "surface_aggregator_platform_hub", .acpi_match_table = ssam_platform_hub_acpi_match, |