---

yaml --- r: 307243 b: refs/heads/master c: d64363c h: refs/heads/master i: 307241: ce2f498 307239: d37c70b v: v3
git-mirror · May 7, 2012 · d71c87e · d71c87e
1 parent 0f1564e
commit d71c87e
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: 9d12028884bd2a5cc1fa7dea5090a4e7f392fdf4
+refs/heads/master: d64363c7557959cf9ddbcd17541a19769720f286
diff --git a/trunk/drivers/gpu/drm/gma500/opregion.c b/trunk/drivers/gpu/drm/gma500/opregion.c
@@ -302,7 +302,7 @@ int psb_intel_opregion_setup(struct drm_device *dev)
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	struct psb_intel_opregion *opregion = &dev_priv->opregion;
 	u32 opregion_phy, mboxes;
-	void *base;
+	void __iomem *base;
 	int err = 0;
 
 	pci_read_config_dword(dev->pdev, PCI_ASLS, &opregion_phy);