From: Paulo Zanoni Date: Thu, 6 Dec 2012 13:12:39 +0000 (-0200) Subject: drm/i915: remove leftover display.update_wm assignment X-Git-Tag: upstream/snapshot3+hdmi~5652^2~40^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0e63c22ee6daae8fda98e1c6eaff5f5f1e2ba31;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git drm/i915: remove leftover display.update_wm assignment This was moved to intel_init_pm. Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fa73b4a..f02ec7b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8284,8 +8284,7 @@ static void intel_init_display(struct drm_device *dev) } else if (IS_HASWELL(dev)) { dev_priv->display.fdi_link_train = hsw_fdi_link_train; dev_priv->display.write_eld = haswell_write_eld; - } else - dev_priv->display.update_wm = NULL; + } } else if (IS_G4X(dev)) { dev_priv->display.write_eld = g4x_write_eld; }