summaryrefslogtreecommitdiff
path: root/linux/drm_memory.h
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-03-04 19:19:20 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-03-04 19:19:20 +0000
commit8d3f3f4f9b8a5611888c35b7683661bcf52ef9cc (patch)
tree7bd83758f000bf8b8cddb93071507d56f9d369e5 /linux/drm_memory.h
parentdb03d12a8fe6c11029127831f1a9bf22056a250b (diff)
Don't try and setup the MTRR for AGP when AGP not available. Check
dev->agp, when agp_acquire called, and..... Uncomment MUST_HAVE_AGP around agp_* calls, so that support for both agp/pci can happen in a single kernel driver.
Diffstat (limited to 'linux/drm_memory.h')
-rw-r--r--linux/drm_memory.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drm_memory.h b/linux/drm_memory.h
index caf05394..e9d3a734 100644
--- a/linux/drm_memory.h
+++ b/linux/drm_memory.h
@@ -352,7 +352,6 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
}
#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-#if __MUST_HAVE_AGP
agp_memory *DRM(alloc_agp)(int pages, u32 type)
{
@@ -456,5 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle)
}
return retcode;
}
-#endif
#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */