diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-17 08:40:32 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-17 08:40:32 +0200 |
commit | cf36ae3e5802716617b9e4d902a31048240396b0 (patch) | |
tree | 2729abc9dae00a6ae10608fbd80bef8335442ed2 /drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | |
parent | 82a1356a933d8443139f8886f11b63c974a09a67 (diff) | |
parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging for v6.0-rc1.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c index 37f6da8b3f2a..31167c398708 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c @@ -26,7 +26,6 @@ #include <drm/drm_plane_helper.h> #include <nouveau_bo.h> -#include <nvif/clc37e.h> #include <nvif/pushc37b.h> #include <nvhw/class/clc57e.h> |