diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-12-06 14:08:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-12-06 14:08:09 +1000 |
| commit | 8de9e417757fb9f130f55a38f4ee7027b60de1c7 (patch) | |
| tree | c701a9e568ebead069a7f967e38e69b0dd7a731b /drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | |
| parent | 00f09afd1740c3b2a1434bf48a124b316aab19f2 (diff) | |
| parent | 584955632841c069678833f3320b4f6d21a8215e (diff) | |
Merge branch 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4 into drm-next
* 'connector-to-object-prop' of git://github.com/robclark/kernel-omap4:
drm: remove legacy drm_connector_property fxns
drm/nouveau: drm_connector_property -> drm_object_property
drm/i915: One more drm_connector_property -> drm_object_property
drm/i2c: drm_connector_property -> drm_object_property
drm/vmwgfx: drm_connector_property -> drm_object_property
drm/udl: drm_connector_property -> drm_object_property
drm/shmob: drm_connector_property -> drm_object_property
drm/radeon: drm_connector_property -> drm_object_property
drm/gma500: drm_connector_property -> drm_object_property
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 60f12855362..26387c3d5a2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -468,7 +468,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit) drm_mode_crtc_set_gamma_size(crtc, 256); - drm_connector_attach_property(connector, + drm_object_attach_property(&connector->base, dev->mode_config.dirty_info_property, 1); |