diff options
| author | Maarten Lankhorst <dev@lankhorst.se> | 2024-12-09 16:28:17 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <dev@lankhorst.se> | 2024-12-09 16:35:21 +0100 |
| commit | 33f029af89791f5d55cbfcb72a6c1b32a8905584 (patch) | |
| tree | d04bdef771982a5401d3835380c1658e404588a8 /drivers/gpu/drm/lima | |
| parent | drm/panel: visionox-rm69299: Remove redundant assignments of panel fields (diff) | |
| parent | Linux 6.13-rc2 (diff) | |
| download | linux-33f029af89791f5d55cbfcb72a6c1b32a8905584.tar.gz linux-33f029af89791f5d55cbfcb72a6c1b32a8905584.zip | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
The v6.13-rc2 release included a bunch of breaking changes,
specifically the MODULE_IMPORT_NS commit.
Backmerge in order to fix them before the next pull-request.
Include the fix from Stephen Roswell.
Caused by commit
25c3fd1183c0 ("drm/virtio: Add a helper to map and note the dma addrs and lengths")
Interacting with commit
cdd30ebb1b9f ("module: Convert symbol namespace to string literal")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://patchwork.freedesktop.org/patch/msgid/20241209121717.2abe8026@canb.auug.org.au
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
Diffstat (limited to 'drivers/gpu/drm/lima')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index 4b70c5189f7c..2067c5b65c57 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -487,7 +487,7 @@ static const struct dev_pm_ops lima_pm_ops = { static struct platform_driver lima_platform_driver = { .probe = lima_pdev_probe, - .remove_new = lima_pdev_remove, + .remove = lima_pdev_remove, .driver = { .name = "lima", .pm = &lima_pm_ops, |