From cc75f725502c5010b76406fd6050a18ce1416622 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Thu, 3 May 2012 15:05:15 +0100
Subject: [PATCH] --- yaml --- r: 307231 b: refs/heads/master c:
 62c5950783546057ca03fb03eee6e3db0ac714d3 h: refs/heads/master i:   307229:
 e660b3b15fa25618cc917d415f3f241c2cc43284   307227:
 7141b402eb2bc62e1d6b90a79857d9e86dae985c   307223:
 fce3f115bf9e2ddda01e69ecdbdb9253e651da5c   307215:
 42b8779e25728955250205037758b41ebd57e9cd   307199:
 34b6bccf204df912c58382bf4947d07ae895238c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/gma500/psb_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 00f4bbb31a56..e8af6053be76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c95e52365f141ff6bfdb172c97d1d2bb2a53f39
+refs/heads/master: 62c5950783546057ca03fb03eee6e3db0ac714d3
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.c b/trunk/drivers/gpu/drm/gma500/psb_drv.c
index d5a6eab8227e..45bd0c78035d 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_drv.c
+++ b/trunk/drivers/gpu/drm/gma500/psb_drv.c
@@ -350,7 +350,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
 	PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);
 
 /*	igd_opregion_init(&dev_priv->opregion_dev); */
-	acpi_video_register();
+/*	acpi_video_register(); */
 	if (dev_priv->lid_state)
 		psb_lid_timer_init(dev_priv);