summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-03-07 08:53:15 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-03-07 08:53:15 +0000
commit07f761bfae8f220c819b67f9f614984f930ff427 (patch)
tree64afcfc5653d2c3b0641f3c72bb6544764c77b70 /linux
parent3a74d3a371acc7b8632885c15ce2f7c05aae94bd (diff)
surround agp calls in drm_memory with __REALLY_HAVE_AGP instead of
CONFIG_... remove include for agpsupport in tdfx_drv.c - not needed.
Diffstat (limited to 'linux')
-rw-r--r--linux/drm_memory.h4
-rw-r--r--linux/tdfx_drv.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/drm_memory.h b/linux/drm_memory.h
index e9d3a734..1763d9b4 100644
--- a/linux/drm_memory.h
+++ b/linux/drm_memory.h
@@ -351,7 +351,7 @@ void DRM(ioremapfree)(void *pt, unsigned long size)
}
}
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
+#if __REALLY_HAVE_AGP
agp_memory *DRM(alloc_agp)(int pages, u32 type)
{
@@ -455,4 +455,4 @@ int DRM(unbind_agp)(agp_memory *handle)
}
return retcode;
}
-#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */
+#endif
diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c
index 71d065f1..f478395f 100644
--- a/linux/tdfx_drv.c
+++ b/linux/tdfx_drv.c
@@ -45,7 +45,6 @@
#define DRIVER_PATCHLEVEL 0
-#include "drm_agpsupport.h"
#include "drm_auth.h"
#include "drm_bufs.h"
#include "drm_context.h"