Merge branch 'upstream' into bugfix-video

[linux-2.6-microblaze.git] / drivers / gpu / drm / gma500 / psb_drv.c

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index caba6e0..b8a131f 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -327,7 +327,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
        PSB_WSGX32(0x20000000, PSB_CR_PDS_EXEC_BASE);
        PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);
 
-       acpi_video_register();
+/*     igd_opregion_init(&dev_priv->opregion_dev); */
+/*     acpi_video_register(); */
 
        ret = drm_vblank_init(dev, dev_priv->num_pipe);
        if (ret)