diff options
| author | David Dawes <dawes@xfree86.org> | 2001-03-19 21:39:36 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2001-03-19 21:39:36 +0000 |
| commit | 404a409ab302c99d8aceb85ede301b04780480d0 (patch) | |
| tree | 2923726ea2744c3e0464aa0352bb2c3708eab630 | |
| parent | 0e5b8d77cfe0f86698041aebe31c54f59c877825 (diff) | |
Initial XFree86 4.0.99.1 merge.
| -rw-r--r-- | bsd/Imakefile | 3 | ||||
| -rw-r--r-- | linux/Makefile.linux | 2 | ||||
| -rw-r--r-- | linux/mga_drm.h | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/bsd/Imakefile b/bsd/Imakefile index 47dff5bf..f5819317 100644 --- 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 d022557d..470c25b3 100644 --- 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 5cf86318..7c296374 100644 --- 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 |