From 23c641e7bcca3bf255d630cbadc50e9c17340baf Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 3 Oct 2013 18:10:55 +0100 Subject: [PATCH] drm/i915: Resolve interaction with drm-fixes tree Signed-off-by: Mark Brown --- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-) 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); } -- 2.39.2