Initial XFree86 4.0.99.1 merge.

diff --git a/bsd/Imakefile b/bsd/Imakefile
index 47dff5b..f581931 100644 (file)
--- a/bsd/Imakefile
+++ b/bsd/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.3 2000/10/27 16:59:40 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.4 2001/01/12 19:28:34 dawes Exp $
 
 #include <Server.tmpl>
 
@@ -18,6 +18,7 @@ LinkSourceFile(drm.h,$(XF86OSSRC)/linux/drm/kernel)
 LinkSourceFile(i810_drm.h,$(XF86OSSRC)/linux/drm/kernel)
 LinkSourceFile(mga_drm.h,$(XF86OSSRC)/linux/drm/kernel)
 LinkSourceFile(r128_drm.h,$(XF86OSSRC)/linux/drm/kernel)
+LinkSourceFile(radeon_drm.h,$(XF86OSSRC)/linux/drm/kernel)
 LinkSourceFile(sis_drm.h,$(XF86OSSRC)/linux/drm/kernel)
 
 

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index d022557..470c25b 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -262,5 +262,5 @@ $(R128OBJS): $(R128HEADERS)
 $(RADEONOBJS): $(RADEONHEADERS)
 endif
 
-clean:
+clean cleandir::
        rm -f *.o *.a *~ core

diff --git a/linux/mga_drm.h b/linux/mga_drm.h
index 5cf8631..7c29637 100644 (file)
--- a/linux/mga_drm.h
+++ b/linux/mga_drm.h
@@ -296,14 +296,14 @@ typedef struct drm_mga_iload {
        unsigned int length;
 } drm_mga_iload_t;
 
-typedef struct drm_mga_blit {
+typedef struct _drm_mga_blit {
        unsigned int planemask;
-       unsigned int srcorg;
-       unsigned int dstorg;
-       int src_pitch, dst_pitch;
+       unsigned int source;
+       unsigned int dest;
        int delta_sx, delta_sy;
        int delta_dx, delta_dy;
        int height, ydir;               /* flip image vertically */
+       int source_pitch, dest_pitch;
 } drm_mga_blit_t;
 
 #endif