Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915: Fix unintended recursion in ironlake_disable_rc6
This commit is contained in:
Dave Airlie 2011-02-25 08:40:26 +10:00
commit 3c0556e967
1 changed files with 1 additions and 1 deletions

View File

@ -6575,7 +6575,7 @@ static void ironlake_disable_rc6(struct drm_device *dev)
POSTING_READ(RSTDBYCTL); POSTING_READ(RSTDBYCTL);
} }
ironlake_disable_rc6(dev); ironlake_teardown_rc6(dev);
} }
static int ironlake_setup_rc6(struct drm_device *dev) static int ironlake_setup_rc6(struct drm_device *dev)