diff options
| -rw-r--r-- | linux-core/drm_memory.h | 4 | ||||
| -rw-r--r-- | linux-core/tdfx_drv.c | 1 | ||||
| -rw-r--r-- | linux/drm_memory.h | 4 | ||||
| -rw-r--r-- | linux/tdfx_drv.c | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/linux-core/drm_memory.h b/linux-core/drm_memory.h index e9d3a734d..1763d9b41 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 71d065f19..f478395f8 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" diff --git a/linux/drm_memory.h b/linux/drm_memory.h index e9d3a734d..1763d9b41 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 71d065f19..f478395f8 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" |