diff options
author | Gareth Hughes <gareth@users.sourceforge.net> | 2001-02-15 05:00:05 +0000 |
---|---|---|
committer | Gareth Hughes <gareth@users.sourceforge.net> | 2001-02-15 05:00:05 +0000 |
commit | e9efc1097c2489fc732e04a23534e132780e6e51 (patch) | |
tree | 69f57ce4c982c6590a6eed012e18dd81522b037b | |
parent | fe9bed36970f0627b5ed76b03bf44ddddb8166aa (diff) |
- Remove AGP support from tdfx driver.mga-1-0-0-20010215-freezemga-1-0-0-branch
- Add __REALLY_HAVE_AGP to drm_agpsupport.h to prevent its inclusion where
appropriate.
-rw-r--r-- | linux-core/drm_agpsupport.c | 4 | ||||
-rw-r--r-- | linux/drm_agpsupport.h | 4 | ||||
-rw-r--r-- | linux/tdfx.h | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c index 1a81211dd..b070a59e6 100644 --- a/linux-core/drm_agpsupport.c +++ b/linux-core/drm_agpsupport.c @@ -33,7 +33,7 @@ #include "drmP.h" #include <linux/module.h> -#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) +#if __REALLY_HAVE_AGP #if LINUX_VERSION_CODE < 0x020400 #include "agpsupport-pre24.h" @@ -332,4 +332,4 @@ int DRM(agp_unbind_memory)(agp_memory *handle) return drm_agp->unbind_memory(handle); } -#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */ +#endif /* __REALLY_HAVE_AGP */ diff --git a/linux/drm_agpsupport.h b/linux/drm_agpsupport.h index 1a81211dd..b070a59e6 100644 --- a/linux/drm_agpsupport.h +++ b/linux/drm_agpsupport.h @@ -33,7 +33,7 @@ #include "drmP.h" #include <linux/module.h> -#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) +#if __REALLY_HAVE_AGP #if LINUX_VERSION_CODE < 0x020400 #include "agpsupport-pre24.h" @@ -332,4 +332,4 @@ int DRM(agp_unbind_memory)(agp_memory *handle) return drm_agp->unbind_memory(handle); } -#endif /* defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) */ +#endif /* __REALLY_HAVE_AGP */ diff --git a/linux/tdfx.h b/linux/tdfx.h index a737374f0..6af675ff6 100644 --- a/linux/tdfx.h +++ b/linux/tdfx.h @@ -34,7 +34,6 @@ */ #define DRM(x) tdfx_##x -#define __HAVE_AGP 1 #define __HAVE_MTRR 1 #define __HAVE_CTX_BITMAP 1 |