From: Mark Brown Date: Thu, 3 Oct 2013 17:10:55 +0000 (+0100) Subject: drm/i915: Resolve interaction with drm-fixes tree X-Git-Tag: next-20131024~10 X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=23c641e7bcca3bf255d630cbadc50e9c17340baf drm/i915: Resolve interaction with drm-fixes tree Signed-off-by: Mark Brown --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 9b70c34fce78..3e140aba4b87 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -6025,7 +6025,5 @@ void intel_pm_init(struct drm_device *dev) INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, intel_gen6_powersave_work); - - INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work); }