aboutsummaryrefslogtreecommitdiff
path: root/linux/drm_agpsupport.h
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2003-07-25 10:50:39 +0000
committerMichel Daenzer <michel@daenzer.net>2003-07-25 10:50:39 +0000
commitbef7017749c9d3af733bdca4863a012f5d6506d3 (patch)
tree8152d62dfe6515a9f89c21934c5beb48b53180d2 /linux/drm_agpsupport.h
parent32ef0f59a8d62460da338568af347286aa450146 (diff)
Compile fixes for recent 2.5/2.6 Linux kernels. I hope this doesn't break
the i830 driver or the BSDs. :)
Diffstat (limited to 'linux/drm_agpsupport.h')
-rw-r--r--linux/drm_agpsupport.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drm_agpsupport.h b/linux/drm_agpsupport.h
index 6eaadfc2..a8f6197b 100644
--- a/linux/drm_agpsupport.h
+++ b/linux/drm_agpsupport.h
@@ -63,7 +63,7 @@ int DRM(agp_info)(struct inode *inode, struct file *filp,
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
- agp_kern_info *kern;
+ DRM_AGP_KERN *kern;
drm_agp_info_t info;
if (!dev->agp || !dev->agp->acquired || !drm_agp->copy_info)
@@ -201,7 +201,7 @@ int DRM(agp_alloc)(struct inode *inode, struct file *filp,
drm_device_t *dev = priv->dev;
drm_agp_buffer_t request;
drm_agp_mem_t *entry;
- agp_memory *memory;
+ DRM_AGP_MEM *memory;
unsigned long pages;
u32 type;
@@ -424,14 +424,14 @@ void DRM(agp_uninit)(void)
}
/** Calls drm_agp->allocate_memory() */
-agp_memory *DRM(agp_allocate_memory)(size_t pages, u32 type)
+DRM_AGP_MEM *DRM(agp_allocate_memory)(size_t pages, u32 type)
{
if (!drm_agp->allocate_memory) return NULL;
return drm_agp->allocate_memory(pages, type);
}
/** Calls drm_agp->free_memory() */
-int DRM(agp_free_memory)(agp_memory *handle)
+int DRM(agp_free_memory)(DRM_AGP_MEM *handle)
{
if (!handle || !drm_agp->free_memory) return 0;
drm_agp->free_memory(handle);
@@ -439,14 +439,14 @@ int DRM(agp_free_memory)(agp_memory *handle)
}
/** Calls drm_agp->bind_memory() */
-int DRM(agp_bind_memory)(agp_memory *handle, off_t start)
+int DRM(agp_bind_memory)(DRM_AGP_MEM *handle, off_t start)
{
if (!handle || !drm_agp->bind_memory) return -EINVAL;
return drm_agp->bind_memory(handle, start);
}
/** Calls drm_agp->unbind_memory() */
-int DRM(agp_unbind_memory)(agp_memory *handle)
+int DRM(agp_unbind_memory)(DRM_AGP_MEM *handle)
{
if (!handle || !drm_agp->unbind_memory) return -EINVAL;
return drm_agp->unbind_memory(handle);