summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgareth <gareth>2001-02-15 05:00:05 +0000
committergareth <gareth>2001-02-15 05:00:05 +0000
commit8fe80b2826bbf976812e0a9c6721f505509d459b (patch)
treefdc3dae0e102876d61a5f43a8e3227ebd64dfd40
parent7937620faf03fcecc4972cb4d0d63708fccf5733 (diff)
- Remove AGP support from tdfx driver.mga-1-0-0-20010215-freeze
- Add __REALLY_HAVE_AGP to drm_agpsupport.h to prevent its inclusion where appropriate.
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agpsupport.h4
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agpsupport.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agpsupport.h
index 1a81211dd..b070a59e6 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agpsupport.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/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/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx.h
index a737374f0..6af675ff6 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx.h
@@ -34,7 +34,6 @@
*/
#define DRM(x) tdfx_##x
-#define __HAVE_AGP 1
#define __HAVE_MTRR 1
#define __HAVE_CTX_BITMAP 1