From: Len Brown Date: Mon, 4 Jun 2012 04:35:19 +0000 (-0400) Subject: Merge branch 'upstream' into bugfix-video X-Git-Tag: v3.5-rc2~19^2^5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a;p=profile%2Fcommon%2Fkernel-common.git Merge branch 'upstream' into bugfix-video Update bugfix-video branch to 2.5-rc1 so I don't have to again resolve the conflict in these patches vs. upstream. Conflicts: drivers/gpu/drm/gma500/psb_drv.c text conflict: add comment vs delete neighboring line keep just this: /* igd_opregion_init(&dev_priv->opregion_dev); */ /* acpi_video_register(); */ Signed-off-by: Len Brown --- 7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a diff --cc drivers/gpu/drm/gma500/psb_drv.c index 09af2ff,caba6e0..b8a131f --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@@ -348,10 -327,7 +327,8 @@@ static int psb_driver_load(struct drm_d 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(); */ - if (dev_priv->lid_state) - psb_lid_timer_init(dev_priv); ret = drm_vblank_init(dev, dev_priv->num_pipe); if (ret)