From 2e3eb5d1581fbf8237d1d3e35fa6be515521b20e Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 25 Apr 2012 14:34:04 +0100 Subject: [PATCH] --- yaml --- r: 310531 b: refs/heads/master c: 155689defc782b486a7e6776a57ecc4ebb37ed52 h: refs/heads/master i: 310529: 8df349538b3be8724dcdc21210734442dafcfcbd 310527: d40fcc47ac7f781867d053c3b0a6f05b14698975 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 239a078c2df3..4642bffce6d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6996bdd850fb53319918487d5f674203517fdc5 +refs/heads/master: 155689defc782b486a7e6776a57ecc4ebb37ed52 diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.c b/trunk/drivers/gpu/drm/gma500/psb_drv.c index c34adf9d910a..09af2ffbb307 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_drv.c +++ b/trunk/drivers/gpu/drm/gma500/psb_drv.c @@ -349,7 +349,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);