Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / gpu / drm / gma500 / mid_bios.c

diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c
index 64d18a3..a97e38e 100644 (file)
--- a/drivers/gpu/drm/gma500/mid_bios.c
+++ b/drivers/gpu/drm/gma500/mid_bios.c
@@ -118,20 +118,20 @@ static void mid_get_pci_revID(struct drm_psb_private *dev_priv)
                                        dev_priv->platform_rev_id);
 }
 
-struct vbt_header {
+struct mid_vbt_header {
        u32 signature;
        u8 revision;
 } __packed;
 
 /* The same for r0 and r1 */
 struct vbt_r0 {
-       struct vbt_header vbt_header;
+       struct mid_vbt_header vbt_header;
        u8 size;
        u8 checksum;
 } __packed;
 
 struct vbt_r10 {
-       struct vbt_header vbt_header;
+       struct mid_vbt_header vbt_header;
        u8 checksum;
        u16 size;
        u8 panel_count;
@@ -281,7 +281,7 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
        struct drm_device *dev = dev_priv->dev;
        u32 addr;
        u8 __iomem *vbt_virtual;
-       struct vbt_header vbt_header;
+       struct mid_vbt_header vbt_header;
        struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));
        int ret = -1;