summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/virtio
diff options
context:
space:
mode:
authorMaarten Lankhorst <dev@lankhorst.se>2024-12-09 16:28:17 +0100
committerMaarten Lankhorst <dev@lankhorst.se>2024-12-09 16:35:21 +0100
commit33f029af89791f5d55cbfcb72a6c1b32a8905584 (patch)
treed04bdef771982a5401d3835380c1658e404588a8 /drivers/gpu/drm/virtio
parent76ba5467ecfd17f63da954c946ec98aa3cbde2d3 (diff)
parentfac04efc5c793dccbd07e2d59af9f90b7fc0dca4 (diff)
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/virtio')
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_prime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 688810d1b611..b3664c12843d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -27,7 +27,7 @@
#include "virtgpu_drv.h"
-MODULE_IMPORT_NS(DMA_BUF);
+MODULE_IMPORT_NS("DMA_BUF");
static int virtgpu_virtio_get_uuid(struct dma_buf *buf,
uuid_t *uuid)