From d71c87efefac5118016d419ddac28cca509e932e Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 3 May 2012 15:09:03 +0100 Subject: [PATCH] --- yaml --- r: 307243 b: refs/heads/master c: d64363c7557959cf9ddbcd17541a19769720f286 h: refs/heads/master i: 307241: ce2f498e8b98d7a4c952812ce83abed6f8dbb5bc 307239: d37c70bc45e74f11ba2156599b2aff893161d560 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/opregion.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 776ab57a13e1..f0a786589d2a 100644 --- 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 index 483e0b28c7aa..05661bfeac75 100644 --- 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);