drm/i915: Fix up mismerge of 3490ea5d in 3.7.y
authorAdam Jackson <ajax@redhat.com>
Wed, 20 Feb 2013 16:54:17 +0000 (11:54 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Feb 2013 17:21:19 +0000 (09:21 -0800)
commit732b2a1a4bb58677ba9c7be3fac0960ceccc9b8f
treea25c159a031a51e41f43c498dd1e8a07b239c9dd
parent53aa75aa360992e07141bbfa2c6062110e678605
drm/i915: Fix up mismerge of 3490ea5d in 3.7.y

The 3.7.y version of this seems to have missed a hunk in i9xx_update_wm.

Tested-by: Glen Gray <slaine@slaine.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/intel_pm.c