diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
| commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
| tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /linux-core/xgi_drv.h | |
| parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
| parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) | |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
Diffstat (limited to 'linux-core/xgi_drv.h')
| -rw-r--r-- | linux-core/xgi_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h index d9a94f5f..9408073e 100644 --- a/linux-core/xgi_drv.h +++ b/linux-core/xgi_drv.h @@ -64,7 +64,7 @@ struct xgi_info { struct drm_map *fb_map; /* look up table parameters */ - struct ati_pcigart_info gart_info; + struct drm_ati_pcigart_info gart_info; unsigned int lutPageSize; struct drm_sman sman; |