aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_memory.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-03-25 09:48:34 +0000
committerDave Airlie <airlied@linux.ie>2005-03-25 09:48:34 +0000
commit956a701544d22c7885e53678531448cd04aba5f5 (patch)
treec7854516eb10d6a60d18143a1a58e85212e1d1a6 /linux-core/drm_memory.c
parent2ad83874287622875f6979da3cd505d18b697704 (diff)
fix up AGP multi-head support for kernel 2.6.12
Diffstat (limited to 'linux-core/drm_memory.c')
-rw-r--r--linux-core/drm_memory.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux-core/drm_memory.c b/linux-core/drm_memory.c
index fcbcb28a..55523c62 100644
--- a/linux-core/drm_memory.c
+++ b/linux-core/drm_memory.c
@@ -151,10 +151,17 @@ void drm_free_pages(unsigned long address, int order, int area)
#if __OS_HAS_AGP
/** Wrapper around agp_allocate_memory() */
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
DRM_AGP_MEM *drm_alloc_agp(int pages, u32 type)
{
return drm_agp_allocate_memory(pages, type);
}
+#else
+DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type)
+{
+ return drm_agp_allocate_memory(bridge, pages, type);
+}
+#endif
/** Wrapper around agp_free_memory() */
int drm_free_agp(DRM_AGP_MEM * handle, int pages)