---

yaml --- r: 228798 b: refs/heads/master c: 4a19d02 h: refs/heads/master v: v3
git-mirror · Dec 9, 2010 · bb20e9d · bb20e9d
1 parent b26a77b
commit bb20e9d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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);
 }