| Message ID | 1363078159-18780-1-git-send-email-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 12, 2013 at 10:49:19AM +0200, Jani Nikula wrote: > Even if "power power" is good for grepping. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Queued for -next, thanks for the patch. Fyi I've merged a few other patches, but might be that the merge confirmation mails have been lost in the awful conference wifi here. So please check my trees, I'm lazy ;-) -Daniel > --- > drivers/gpu/drm/i915/intel_pm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 5479363..be43f71 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/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; > } > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 5479363..be43f71 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/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; }
Even if "power power" is good for grepping. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)