Compile fixes for recent 2.5/2.6 Linux kernels. I hope this doesn't break

    the i830 driver or the BSDs. :)

1 files changed, 6 insertions, 6 deletions

diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c
index 6eaadfc2..a8f6197b 100644
--- a/linux-core/drm_agpsupport.c
+++ b/linux-core/drm_agpsupport.c
@@ -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);