diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
commit | 3a3f39d144c47ce937d6924d344a9ad3d82a2db5 (patch) | |
tree | 109faf867b2e5774d54fe9499dbfebd3f26f014f /bsd-core/ati_pcigart.c | |
parent | 070755af3fecefb6b09e8ef98738e4926e4148a7 (diff) | |
parent | 5b86823fa36513f521412a38c240cb18f02dcc9a (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Diffstat (limited to 'bsd-core/ati_pcigart.c')
-rw-r--r-- | bsd-core/ati_pcigart.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bsd-core/ati_pcigart.c b/bsd-core/ati_pcigart.c index bb0c46e2..2b511ada 100644 --- a/bsd-core/ati_pcigart.c +++ b/bsd-core/ati_pcigart.c @@ -35,7 +35,8 @@ #define ATI_PCIGART_PAGE_SIZE 4096 /* PCI GART page size */ -int drm_ati_pcigart_init(drm_device_t *dev, struct drm_ati_pcigart_info *gart_info) +int drm_ati_pcigart_init(struct drm_device *dev, + struct drm_ati_pcigart_info *gart_info) { unsigned long pages; u32 *pci_gart = NULL, page_base; @@ -94,7 +95,8 @@ int drm_ati_pcigart_init(drm_device_t *dev, struct drm_ati_pcigart_info *gart_in return 1; } -int drm_ati_pcigart_cleanup(drm_device_t *dev, struct drm_ati_pcigart_info *gart_info) +int drm_ati_pcigart_cleanup(struct drm_device *dev, + struct drm_ati_pcigart_info *gart_info) { if (dev->sg == NULL) { DRM_ERROR( "no scatter/gather memory!\n" ); |