On Sun, Jun 15, 2003 at 08:39:55PM +0200, Dieter N�tzel wrote:
> Am Sonntag, 15. Juni 2003 19:39 schrieb Jos� Fonseca:
> > On Sun, Jun 15, 2003 at 06:50:29PM +0200, Dieter N�tzel wrote:
> > > Am Sonntag, 15. Juni 2003 17:55 schrieb Leif Delgass:
> > > > According to the sourceforge website, anonymous (pserver) cvs access
> > > > and ViewCVS have been moved to the backup server to reduce the load on
> > > > the main (developer) server.  The backup server will be around 24 hours
> > > > behind the main server.
> > >
> > > In short: What a _mess_!
> >
> > Has this been overcomed
> 
> No.
> 
> > or do you want me to produce a patch?
> 
> Yes, please.

Attached below. I could have done this sooner but I didn't think of it.
Sorry about that.

Jos� Fonseca
Index: drmP.h
===================================================================
RCS file: 
/cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- drmP.h      3 Jun 2003 23:27:00 -0000       1.74
+++ drmP.h      14 Jun 2003 15:18:48 -0000      1.75
@@ -66,10 +66,6 @@
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
-#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
-#include <linux/types.h>
-#include <linux/agp_backend.h>
-#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
 #define HAS_WORKQUEUE 0
 #else
@@ -90,9 +86,6 @@
 /** \name DRM template customization defaults */
 /[EMAIL PROTECTED]/
 
-#ifndef __HAVE_AGP
-#define __HAVE_AGP             0
-#endif
 #ifndef __HAVE_MTRR
 #define __HAVE_MTRR            0
 #endif
@@ -112,8 +105,6 @@
 #define __HAVE_DMA_FREELIST    0
 #endif
 
-#define __REALLY_HAVE_AGP      (__HAVE_AGP && (defined(CONFIG_AGP) || \
-                                               defined(CONFIG_AGP_MODULE)))
 #define __REALLY_HAVE_MTRR     (__HAVE_MTRR && defined(CONFIG_MTRR))
 #define __REALLY_HAVE_SG       (__HAVE_SG)
 
Index: drm_agp.h
===================================================================
RCS file: 
/cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_agp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm_agp.h   7 Jun 2003 12:30:22 -0000       1.2
+++ drm_agp.h   14 Jun 2003 15:18:49 -0000      1.3
@@ -34,6 +34,19 @@
 #ifndef _DRM_AGP_H_
 #define _DRM_AGP_H_
 
+#ifndef __HAVE_AGP
+#define __HAVE_AGP 0
+#endif
+
+#define __REALLY_HAVE_AGP (__HAVE_AGP && \
+               (defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)))
+
+#if __REALLY_HAVE_AGP
+
+
+#include <linux/types.h>
+#include <linux/agp_backend.h>
+
 
 /** 
  * AGP memory entry.  Stored as a doubly linked list.
@@ -92,4 +105,7 @@
 
 /[EMAIL PROTECTED]/
 
-#endif
+
+#endif /* __REALLY_HAVE_AGP */
+
+#endif /* !_DRM_AGP_H_ */

Reply via email to