---

yaml --- r: 281411 b: refs/heads/master c: 8e04d6d h: refs/heads/master i: 281409: 3bea085 281407: 08f1203 v: v3
git-mirror · Dec 22, 2011 · bca93fb · bca93fb
1 parent 2a5e67a
commit bca93fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 221fd753dd002222b595f8af0e289fff0c9cf5a8
+refs/heads/master: 8e04d6d83a8ddbd6d81f497e583b8d15de3c2995
diff --git a/trunk/drivers/staging/gma500/power.c b/trunk/drivers/staging/gma500/power.c
@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
 	ret = gma_resume_pci(dev->pdev);
 	if (ret == 0) {
 		/* FIXME: we want to defer this for Medfield/Oaktrail */
-		gma_resume_display(dev);
+		gma_resume_display(dev->pdev);
 		psb_irq_preinstall(dev);
 		psb_irq_postinstall(dev);
 		pm_runtime_get(&dev->pdev->dev);