summaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-09-25 09:32:16 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-09-25 09:32:16 +0000
commitca820fca877faf4776be142417795a5945c606e6 (patch)
tree3b43fba2476fcbd4f81fa26b400549ad1df766f7 /linux-core/drmP.h
parent390440c9399a3c01811f3b37c2628d6e905656e8 (diff)
merge with 2.4.10 kernel
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 13a21f3b..4786ba9e 100644
--- a/linux-core/drmP.h
+++ b/linux-core/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