diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:24:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:25:55 +0200 |
| commit | eec19d1a0d04c80e66eef634f7b8f460f2ca5643 (patch) | |
| tree | e68f24938d458fc776b76dc6037f9a2d03f09403 /drivers/gpu/drm/gma500/psb_drv.c | |
| parent | f726a697d06102e7a1fc0a87308cb30a84580205 (diff) | |
| parent | a018540141a931f5299a866907b27886916b4374 (diff) | |
Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_drv.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index caba6e08693..a8858a907f4 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -374,6 +374,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) if (ret) return ret; + psb_intel_opregion_enable_asle(dev); #if 0 /*enable runtime pm at last*/ pm_runtime_enable(&dev->pdev->dev); |