From 8bc39d01cae622db6097b967c132f9b0e04fb785 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon, 10 Jul 2000 21:32:06 +0000
Subject: Import of XFree86 4.0.1

---
 bsd-core/drmP.h       | 2 +-
 bsd/Imakefile         | 2 +-
 bsd/drm/drmstat.c     | 2 +-
 bsd/drm/proc.c        | 2 +-
 bsd/drm/sysctl.c      | 2 +-
 bsd/drmP.h            | 2 +-
 bsd/r128_drm.h        | 2 +-
 linux-core/r128_drv.c | 7 -------
 linux/r128_drv.c      | 7 -------
 9 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index a60ddae2..b62aff08 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h,v 1.1 2000/06/17 00:03:28 martin Exp $
  * 
  */
 
diff --git a/bsd/Imakefile b/bsd/Imakefile
index cf042d21..7d33c205 100644
--- a/bsd/Imakefile
+++ b/bsd/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86$
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.1 2000/06/17 00:03:28 martin Exp $
 XCOMM $PI$
 
 #include <Server.tmpl>
diff --git a/bsd/drm/drmstat.c b/bsd/drm/drmstat.c
index 0ce76b01..48fb1b16 100644
--- a/bsd/drm/drmstat.c
+++ b/bsd/drm/drmstat.c
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c,v 1.28 1999/08/04 18:12:11 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmstat.c,v 1.1 1999/09/25 14:37:59 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/drmstat.c,v 1.1 2000/06/17 00:03:30 martin Exp $
  * 
  */
 
diff --git a/bsd/drm/proc.c b/bsd/drm/proc.c
index 12168aa3..3f6616ef 100644
--- a/bsd/drm/proc.c
+++ b/bsd/drm/proc.c
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.4 1999/08/20 15:36:46 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c,v 1.1 1999/09/25 14:38:02 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/proc.c,v 1.1 2000/06/17 00:03:30 martin Exp $
  *
  */
 
diff --git a/bsd/drm/sysctl.c b/bsd/drm/sysctl.c
index 7c736abf..a890abac 100644
--- a/bsd/drm/sysctl.c
+++ b/bsd/drm/sysctl.c
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI$
- * $XFree86$
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/sysctl.c,v 1.1 2000/06/17 00:03:31 martin Exp $
  *
  */
 
diff --git a/bsd/drmP.h b/bsd/drmP.h
index a60ddae2..b62aff08 100644
--- a/bsd/drmP.h
+++ b/bsd/drmP.h
@@ -25,7 +25,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  * $PI: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.58 1999/08/30 13:05:00 faith Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1 1999/09/25 14:37:59 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h,v 1.1 2000/06/17 00:03:28 martin Exp $
  * 
  */
 
diff --git a/bsd/r128_drm.h b/bsd/r128_drm.h
index fa90d72d..bff103c2 100644
--- a/bsd/r128_drm.h
+++ b/bsd/r128_drm.h
@@ -25,7 +25,7 @@
  *
  * Authors: Kevin E. Martin <kevin@precisioninsight.com>
  *
- * $XFree86$
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drm.h,v 1.1 2000/06/17 00:03:29 martin Exp $
  */
 
 #ifndef _R128_DRM_H_
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 4c065551..8b669888 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -369,13 +369,6 @@ int r128_init(void)
 
 #ifdef DRM_AGP
 	dev->agp    = drm_agp_init();
-      	if (dev->agp == NULL) {
-	   	DRM_ERROR("Cannot initialize agpgart module.\n");
-	   	drm_proc_cleanup();
-	   	misc_deregister(&r128_misc);
-	   	r128_takedown(dev);
-	   	return -ENOMEM;
-	}
 
 #ifdef CONFIG_MTRR
 	dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index 4c065551..8b669888 100644
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -369,13 +369,6 @@ int r128_init(void)
 
 #ifdef DRM_AGP
 	dev->agp    = drm_agp_init();
-      	if (dev->agp == NULL) {
-	   	DRM_ERROR("Cannot initialize agpgart module.\n");
-	   	drm_proc_cleanup();
-	   	misc_deregister(&r128_misc);
-	   	r128_takedown(dev);
-	   	return -ENOMEM;
-	}
 
 #ifdef CONFIG_MTRR
 	dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,
-- 
cgit v1.2.3