From 89231576bc6be3af6da8482583292440b1cdeb1a Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 12 Mar 2013 10:49:19 +0200 Subject: [PATCH] --- yaml --- r: 371191 b: refs/heads/master c: def27a58291f389d2c351ebf32ef5bb064587635 h: refs/heads/master i: 371189: 2b3745897ec1f7ebb9c3491c724283282bf3d8de 371187: 2a78ba1983c76980029b89d9c2f92737975c52af 371183: 3738fd6269d9605bfb309a4056716b873aeaa079 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eab4a150dced..319e19ee34b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3058753583c6a641bac188011b4d777adec916c9 +refs/heads/master: def27a58291f389d2c351ebf32ef5bb064587635 diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index 5479363083c6..be43f7107c99 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/drivers/gpu/drm/i915/intel_pm.c @@ -2821,7 +2821,7 @@ static void ironlake_enable_rc6(struct drm_device *dev) ret = intel_ring_idle(ring); dev_priv->mm.interruptible = was_interruptible; if (ret) { - DRM_ERROR("failed to enable ironlake power power savings\n"); + DRM_ERROR("failed to enable ironlake power savings\n"); ironlake_teardown_rc6(dev); return; }