From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 8 Jan 2010 23:45:33 +0000 (+0100)
Subject: drm/i915: Fix resume regression on MSI Wind U100 w/o KMS
X-Git-Tag: v2.6.33-rc5~62^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8e292093a3a78a7967757e90abbe64869e4cb7c;p=pandora-kernel.git

drm/i915: Fix resume regression on MSI Wind U100 w/o KMS

Commit cbda12d77ea590082edb6d30bd342a67ebc459e0 (drm/i915: implement
new pm ops for i915), among other things, removed the .suspend and
.resume pointers from the struct drm_driver object in i915_drv.c,
which broke resume without KMS on my MSI Wind U100.

Fix this by reverting that part of commit cbda12d77ea59.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[anholt: added comment explaining when .suspend/.resume matter]
Signed-off-by: Eric Anholt <eric@anholt.net>
---

Reading git-diff-tree failed