summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-02-14 09:58:34 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-02-14 09:58:34 +0000
commit82764804ffb2f1cc1059aa86ca38b4281db29e23 (patch)
tree3d1224361549066618f5400fef3e96e3b6027dbb
parent545cf76dac975c777734bbc04d463e1f967eb388 (diff)
downloaddrm-82764804ffb2f1cc1059aa86ca38b4281db29e23.tar.gz
Ha ! Nice One. WTF?? again... Should be __REALLY_HAVE_AGP, not
__MUST_HAVE_AGP.
-rw-r--r--linux-core/drm_bufs.c4
-rw-r--r--linux/drm_bufs.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index 0be5d24d..10b12875 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -124,13 +124,11 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
dev->lock.hw_lock = map->handle; /* Pointer to lock */
}
break;
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-#if 1 /* __MUST_HAVE_AGP GH: WTF??? */
+#if __REALLY_HAVE_AGP
case _DRM_AGP:
map->offset = map->offset + dev->agp->base;
break;
#endif
-#endif
default:
DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
return -EINVAL;
diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index 0be5d24d..10b12875 100644
--- a/linux/drm_bufs.h
+++ b/linux/drm_bufs.h
@@ -124,13 +124,11 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
dev->lock.hw_lock = map->handle; /* Pointer to lock */
}
break;
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-#if 1 /* __MUST_HAVE_AGP GH: WTF??? */
+#if __REALLY_HAVE_AGP
case _DRM_AGP:
map->offset = map->offset + dev->agp->base;
break;
#endif
-#endif
default:
DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
return -EINVAL;