Merge branch 'upstream' into bugfix-video

[karo-tx-linux.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 0c995ba0f2ec393d32251f62b6c7efb56a6288d4..b8a131fcb283308d6a3d2cc695fa08c91f2953ff 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)
@@ -595,7 +596,7 @@ static const struct dev_pm_ops psb_pm_ops = {
        .runtime_idle = psb_runtime_idle,
 };
 
-static struct vm_operations_struct psb_gem_vm_ops = {
+static const struct vm_operations_struct psb_gem_vm_ops = {
        .fault = psb_gem_fault,
        .open = drm_gem_vm_open,
        .close = drm_gem_vm_close,