---

yaml --- r: 259674 b: refs/heads/master c: bcc70a6 h: refs/heads/master v: v3
git-mirror · Jul 5, 2011 · b39f083 · b39f083
1 parent 8ef61c8
commit b39f083
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: 5338afdfb5eeaefeefd9dcdb06977920eca5d941
+refs/heads/master: bcc70a64a443ec19f84bb0dc3268d2c95b52e209
diff --git a/trunk/drivers/staging/gma500/psb_powermgmt.c b/trunk/drivers/staging/gma500/psb_powermgmt.c
@@ -64,7 +64,7 @@ void gma_power_init(struct drm_device *dev)
 	dev_priv->suspended = false;	/* And not suspended */
 	mutex_init(&power_mutex);
 
-	if (!IS_MRST(dev)) {
+	if (!IS_MRST(dev) && !IS_MFLD(dev)) {
 		/* FIXME: wants further review */
 		u32 gating = PSB_RSGX32(PSB_CR_CLKGATECTL);
 		/* Disable 2D clock gating */