From bb20e9df040ee4eb83312a8acdcca4e7c4cd3b6b Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 8 Dec 2010 13:31:49 +0000
Subject: [PATCH] --- yaml --- r: 228798 b: refs/heads/master c:
 4a19d02e0a8cd8799e5d150d8eb74861e1a4cdec h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6ec0255dd86a..0be384725518 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8f7ab1788f23d79084f051bb9ae3cb02b55bff3
+refs/heads/master: 4a19d02e0a8cd8799e5d150d8eb74861e1a4cdec
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index 91a3ad2cf942..ad28b21f4d03 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -700,11 +700,6 @@ static int __init i915_init(void)
 		driver.driver_features &= ~DRIVER_MODESET;
 #endif
 
-	if (!(driver.driver_features & DRIVER_MODESET)) {
-		driver.suspend = i915_suspend;
-		driver.resume = i915_resume;
-	}
-
 	return drm_init(&driver);
 }