From 07f761bfae8f220c819b67f9f614984f930ff427 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Wed, 7 Mar 2001 08:53:15 +0000 Subject: surround agp calls in drm_memory with __REALLY_HAVE_AGP instead of CONFIG_... remove include for agpsupport in tdfx_drv.c - not needed. --- linux-core/drm_memory.h | 4 ++-- linux-core/tdfx_drv.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'linux-core') diff --git a/linux-core/drm_memory.h b/linux-core/drm_memory.h index e9d3a734..1763d9b4 100644 --- a/linux-core/drm_memory.h +++ b/linux-core/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-core/tdfx_drv.c b/linux-core/tdfx_drv.c index 71d065f1..f478395f 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/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" -- cgit v1.2.3