summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-05-03 15:05:15 +0100
committerDave Airlie <airlied@redhat.com>2012-05-03 16:28:02 +0100
commit62c5950783546057ca03fb03eee6e3db0ac714d3 (patch)
tree1e9501dc858b6109ad9b343d43c8264564b063dc
parent0c95e52365f141ff6bfdb172c97d1d2bb2a53f39 (diff)
downloadlinux-3.10-62c5950783546057ca03fb03eee6e3db0ac714d3.tar.gz
linux-3.10-62c5950783546057ca03fb03eee6e3db0ac714d3.tar.bz2
linux-3.10-62c5950783546057ca03fb03eee6e3db0ac714d3.zip
gma500: don't register the ACPI video bus
We are not yet ready for this and it makes a mess on some devices. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/gma500/psb_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index d5a6eab8227..45bd0c78035 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/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);