summaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-06-17 09:09:17 +0000
committerDave Airlie <airlied@linux.ie>2005-06-17 09:09:17 +0000
commit71df0eed3476d4430a59ce21ca641ac8eecf54e2 (patch)
tree1b49d7846e3ca3dc516afa126498920bb642c002 /linux-core/drmP.h
parent0569fe7a528e5e0753d9f72807a8f4310c6c9782 (diff)
fix up drm_alloc_agp to take a dev arg and not pass crappy agpgart around
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 7d5902ef..410a3e2c 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -786,11 +786,7 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);
extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
extern unsigned long drm_alloc_pages(int order, int area);
extern void drm_free_pages(unsigned long address, int order, int area);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
-extern DRM_AGP_MEM *drm_alloc_agp(int pages, u32 type);
-#else
-extern DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type);
-#endif
+extern DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type);
extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
extern int drm_unbind_agp(DRM_AGP_MEM * handle);