]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
gma500: lid_state should be __iomem
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Thu, 3 May 2012 14:09:03 +0000 (15:09 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 7 May 2012 09:58:54 +0000 (10:58 +0100)
This was mostly already fixed but this one change is needed to match Kirill's
original submission

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/gma500/opregion.c

index 483e0b28c7aade840009bc71c3161bfbf83d6748..05661bfeac75f62e0fb29c29e5109b1a5f77f7ad 100644 (file)
@@ -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);