From ebd64b2c4b08cd33289f24147d1597071e3d4d7f Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 13 Aug 2010 00:56:54 +0100
Subject: [PATCH] --- yaml --- r: 209337 b: refs/heads/master c:
 54b9b308fa39e5147e2edde3492d8650b957be6c h: refs/heads/master i:   209335:
 0f6101335244c9932fd85d2c0dbbf8c48beba698 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/i915_opregion.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4a6cf14a1152..8ed45dba924d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2016e4a0a1c49b68c9d820e28dadab7080c45d1b
+refs/heads/master: 54b9b308fa39e5147e2edde3492d8650b957be6c
diff --git a/trunk/drivers/gpu/drm/i915/i915_opregion.c b/trunk/drivers/gpu/drm/i915/i915_opregion.c
index 8fcc75c1aa28..d1bf92b99788 100644
--- a/trunk/drivers/gpu/drm/i915/i915_opregion.c
+++ b/trunk/drivers/gpu/drm/i915/i915_opregion.c
@@ -535,6 +535,7 @@ int intel_opregion_init(struct drm_device *dev, int resume)
 err_out:
 	iounmap(opregion->header);
 	opregion->header = NULL;
+	acpi_video_register();
 	return err;
 }