From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 23 Nov 2021 08:17:43 +0000 (+1000)
Subject: drm/nouveau/disp: remove some remnant of a rework
X-Git-Tag: v6.6.17~3937^2~23^2~3327
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=007354597d5c12a8d44a34c66a2e1a089bc7d3d8;p=platform%2Fkernel%2Flinux-rpi.git

drm/nouveau/disp: remove some remnant of a rework

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/17
---

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
index e484d0c3b0d4..7653d80b4076 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
@@ -9,10 +9,7 @@
 #include <subdev/bios/dp.h>
 
 struct nvkm_dp {
-	union {
-		struct nvkm_outp base;
-		struct nvkm_outp outp;
-	};
+	struct nvkm_outp outp;
 
 	struct nvbios_dpout info;
 	u8 version;