diff options
| author | Thomas Zimmermann <[email protected]> | 2025-06-11 07:01:34 +0000 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2025-06-11 07:01:34 +0000 |
| commit | c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5 (patch) | |
| tree | a5b6f4655cde4f19b6b157aa455723c0329bd719 /drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c | |
| parent | drm/panel: ilitek-ili9881c: Add configuration for 7" Raspberry Pi 720x1280 (diff) | |
| parent | Linux 6.16-rc1 (diff) | |
| download | kernel-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.tar.gz kernel-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging to forward to v6.16-rc1
Signed-off-by: Thomas Zimmermann <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c index 9446049642e1..d294844d9eae 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c @@ -42,7 +42,7 @@ r535_vfn_new(const struct nvkm_vfn_func *hw, return -ENOMEM; rm->dtor = r535_vfn_dtor; - rm->intr = &tu102_vfn_intr, + rm->intr = &tu102_vfn_intr; rm->user.addr = 0x030000; rm->user.size = 0x010000; rm->user.base.minver = -1; |