From ca820fca877faf4776be142417795a5945c606e6 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue, 25 Sep 2001 09:32:16 +0000
Subject: merge with 2.4.10 kernel

---
 linux/drmP.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linux/drmP.h')

diff --git a/linux/drmP.h b/linux/drmP.h
index 13a21f3b..4786ba9e 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -443,6 +443,8 @@ typedef struct drm_agp_head {
 	int                acquired;
 	unsigned long      base;
    	int 		   agp_mtrr;
+	int		   cant_use_aperture;
+	unsigned long	   page_mask;
 } drm_agp_head_t;
 #endif
 
@@ -451,9 +453,7 @@ typedef struct drm_sg_mem {
 	void            *virtual;
 	int             pages;
 	struct page     **pagelist;
-#if defined(__alpha__)
 	dma_addr_t	*busaddr;
-#endif
 } drm_sg_mem_t;
 
 typedef struct drm_sigdata {
@@ -544,8 +544,8 @@ typedef struct drm_device {
 #if __REALLY_HAVE_AGP
 	drm_agp_head_t    *agp;
 #endif
-#ifdef __alpha__
 	struct pci_dev *pdev;
+#ifdef __alpha__
 #if LINUX_VERSION_CODE < 0x020403
 	struct pci_controler *hose;
 #else
-- 
cgit v1.2.3