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-20131018~59 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ecdcfda8bda6ba5b574a0d4beb7e5ca9dcb3ee1;p=karo-tx-linux.git 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 8f57394d6f99..1a03c8a5b3b7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5881,7 +5881,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); }