aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-05-28 05:22:01 -0400
committerDave Airlie <airlied@redhat.com>2010-05-31 19:37:29 -0400
commitbbfad33663fe8de1cce84ac776664292c46fe7ae (patch)
tree6f77bc76c5207196c5d7f7657272e66d3c32038d /drivers
parent22ee861c816689b2566290356d54e4a01c9b2e74 (diff)
drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit.
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index 8fde9bf8be4..b35d7b0fd48 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -50,8 +50,6 @@ struct vmw_legacy_display_unit {
50 struct vmw_display_unit base; 50 struct vmw_display_unit base;
51 51
52 struct list_head active; 52 struct list_head active;
53
54 unsigned unit;
55}; 53};
56 54
57static void vmw_ldu_destroy(struct vmw_legacy_display_unit *ldu) 55static void vmw_ldu_destroy(struct vmw_legacy_display_unit *ldu)
@@ -204,7 +202,7 @@ static int vmw_ldu_add_active(struct vmw_private *vmw_priv,
204 202
205 at = &ld->active; 203 at = &ld->active;
206 list_for_each_entry(entry, &ld->active, active) { 204 list_for_each_entry(entry, &ld->active, active) {
207 if (entry->unit > ldu->unit) 205 if (entry->base.unit > ldu->base.unit)
208 break; 206 break;
209 207
210 at = &entry->active; 208 at = &entry->active;
@@ -491,7 +489,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
491 if (!ldu) 489 if (!ldu)
492 return -ENOMEM; 490 return -ENOMEM;
493 491
494 ldu->unit = unit; 492 ldu->base.unit = unit;
495 crtc = &ldu->base.crtc; 493 crtc = &ldu->base.crtc;
496 encoder = &ldu->base.encoder; 494 encoder = &ldu->base.encoder;
497 connector = &ldu->base.connector; 495 connector = &ldu->base.connector;