diff options
24 files changed, 168 insertions, 68 deletions
diff --git a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c index 24cbbbca9..cdd74fb4f 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c @@ -59,7 +59,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdio.h> #include "xf86drm.h" -#include "xf86drmMga.h" +#include "mga_common.h" #include "mga_xmesa.h" #include "context.h" #include "matrix.h" diff --git a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h index 83e22c047..891bf5956 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h +++ b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h @@ -35,7 +35,7 @@ #include "dri_util.h" #include "mtypes.h" #include "mgaregs.h" -#include "xf86drmMga.h" +#include "mga_common.h" typedef struct mga_screen_private_s { diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c index b32d101d1..594bbc595 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c @@ -46,7 +46,7 @@ #include "xf86drm.h" -#include "xf86drmMga.h" +#include "mga_common.h" static void mga_iload_dma_ioctl(mgaContextPtr mmesa, unsigned long dest, diff --git a/xc/lib/GL/mesa/src/drv/mga/mgapixel.c b/xc/lib/GL/mesa/src/drv/mga/mgapixel.c index 9b3cee9e2..1af691246 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgapixel.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgapixel.c @@ -38,7 +38,7 @@ #include "mgabuffers.h" #include "xf86drm.h" -#include "xf86drmMga.h" +#include "mga_common.h" #include "swrast/swrast.h" diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_context.h b/xc/lib/GL/mesa/src/drv/r128/r128_context.h index 7f3a90ec9..28d35062d 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_context.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_context.h @@ -43,7 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dri_util.h" #include "xf86drm.h" -#include "xf86drmR128.h" +#include "r128_common.h" #include "mtypes.h" diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h index a0c72000b..955f3b4f8 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h @@ -42,7 +42,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_lock.h" #include "xf86drm.h" -#include "xf86drmR128.h" +#include "r128_common.h" #define R128_BUFFER_MAX_DWORDS (R128_BUFFER_SIZE / sizeof(CARD32)) diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h b/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h index 5dfb1f59b..4dc915e40 100644 --- a/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h +++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_context.h @@ -44,7 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dri_util.h" #include "xf86drm.h" -#include "xf86drmRadeon.h" +#include "radeon_common.h" #include "macros.h" #include "mtypes.h" diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h b/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h index 030864f42..e77858f61 100644 --- a/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h +++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h @@ -43,7 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_lock.h" #include "xf86drm.h" -#include "xf86drmRadeon.h" +#include "radeon_common.h" #define RADEON_BUFFER_MAX_DWORDS (RADEON_BUFFER_SIZE / sizeof(CARD32)) diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h b/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h index 1098afa2c..96ab00879 100644 --- a/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h +++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h @@ -42,7 +42,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/Xlibint.h> #include "dri_util.h" #include "xf86drm.h" -#include "xf86drmRadeon.h" +#include "radeon_common.h" #include "radeon_sarea.h" typedef struct { diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/xf86drmR128.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_common.h index 9173614cc..5d5bed8b4 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/xf86drmR128.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_common.h @@ -1,7 +1,8 @@ -/* xf86drm.h -- OS-independent header for DRM user-level library interface +/* r128_common.h -- common header definitions for R128 2D/3D/DRM suite * Created: Sun Apr 9 18:16:28 2000 by kevin@precisioninsight.com * * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -27,12 +28,15 @@ * Gareth Hughes <gareth@valinux.com> * Kevin E. Martin <martin@valinux.com> * + * Converted to common header format: + * Jens Owen <jens@tungstengraphics.com> + * * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmR128.h,v 3.11 2001/04/16 15:02:13 tsi Exp $ * */ -#ifndef _XF86DRI_R128_H_ -#define _XF86DRI_R128_H_ +#ifndef _R128_COMMON_H_ +#define _R128_COMMON_H_ #include "X11/Xmd.h" diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h index 5ef9cdfee..64345d3c2 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.h @@ -40,7 +40,7 @@ #define _R128_DRI_ #include "xf86drm.h" -#include "xf86drmR128.h" +#include "r128_common.h" /* DRI Driver defaults */ #define R128_DEFAULT_CCE_PIO_MODE R128_PM4_64PIO_64VCBM_64INDBM diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c index 557025b7b..031026d9b 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c @@ -4,7 +4,7 @@ #include "r128_reg.h" #ifdef XF86DRI -#include "xf86drmR128.h" +#include "r128_common.h" #include "r128_sarea.h" #endif diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/xf86drmRadeon.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h index 30980a9d1..89f92cc8f 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/xf86drmRadeon.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h @@ -1,7 +1,7 @@ -/* xf86drmRadeon.h -- OS-independent header for Radeon DRM user-level - * library interface +/* radeon_common.h -- common header definitions for Radeon 2D/3D/DRM suite * * Copyright 2000 VA Linux Systems, Inc., Fremont, California. + * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -28,12 +28,15 @@ * Kevin E. Martin <martin@valinux.com> * Keith Whitwell <keith_whitwell@yahoo.com> * + * Converted to common header format: + * Jens Owen <jens@tungstengraphics.com> + * * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmRadeon.h,v 1.6 2001/04/16 15:02:13 tsi Exp $ * */ -#ifndef _XF86DRI_RADEON_H_ -#define _XF86DRI_RADEON_H_ +#ifndef _RADEON_COMMON_H_ +#define _RADEON_COMMON_H_ /* WARNING: If you change any of these defines, make sure to change * the kernel include file as well (radeon_drm.h) diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h index 553d54526..4a4f53724 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h @@ -38,7 +38,7 @@ #define _RADEON_DRI_ #include "xf86drm.h" -#include "xf86drmRadeon.h" +#include "radeon_common.h" /* DRI Driver defaults */ #define RADEON_DEFAULT_CP_PIO_MODE RADEON_CSQ_PRIPIO_INDPIO diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h index 351713e56..530fd4abb 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dripriv.h @@ -39,7 +39,7 @@ #include "GL/glxint.h" #include "xf86drm.h" -#include "xf86drmRadeon.h" +#include "radeon_common.h" #define RADEON_MAX_DRAWABLES 256 diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h new file mode 100644 index 000000000..71f6f6d48 --- /dev/null +++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h @@ -0,0 +1,63 @@ +/* glint_common.h -- common header definitions for Gamma 2D/3D/DRM suite + * + * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Converted to common header format: + * Jens Owen <jens@tungstengraphics.com> + * + * $XFree86$ + * + */ + +#ifndef _GLINT_COMMON_H_ +#define _GLINT_COMMON_H_ + +/* + * WARNING: If you change any of these defines, make sure to change + * the kernel include file as well (gamma_drm.h) + */ + +/* Driver specific DRM command indices + * NOTE: these are not OS specific, but they are driver specific + */ +#define DRM_GAMMA_INIT 0x00 +#define DRM_GAMMA_COPY 0x01 + +typedef struct { + enum { + GAMMA_INIT_DMA = 0x01, + GAMMA_CLEANUP_DMA = 0x02 + } func; + int sarea_priv_offset; + int pcimode; + unsigned int mmio0; + unsigned int mmio1; + unsigned int mmio2; + unsigned int mmio3; + unsigned int buffers_offset; +} drmGAMMAInit; + +extern int drmGAMMAInitDMA( int fd, drmGAMMAInit *info ); +extern int drmGAMMACleanupDMA( int fd ); + +#endif diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h index 5558110e6..8285f17fb 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h @@ -36,8 +36,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _GLINT_DRI_H_ #define _GLINT_DRI_H_ -#include <xf86drm.h> -#include <xf86drmGamma.h> +#include "xf86drm.h" +#include "glint_common.h" typedef struct { unsigned int GDeltaMode; diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/xf86drmGamma.h b/xc/programs/Xserver/hw/xfree86/drivers/glint/xf86drmGamma.h deleted file mode 100644 index f2381a286..000000000 --- a/xc/programs/Xserver/hw/xfree86/drivers/glint/xf86drmGamma.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __XF86DRI_GAMMA_H__ -#define __XF86DRI_GAMMA_H__ - -/* - * WARNING: If you change any of these defines, make sure to change - * the kernel include file as well (gamma_drm.h) - */ - -/* Driver specific DRM command indices - * NOTE: these are not OS specific, but they are driver specific - */ -#define DRM_GAMMA_INIT 0x00 -#define DRM_GAMMA_COPY 0x01 - -typedef struct { - enum { - GAMMA_INIT_DMA = 0x01, - GAMMA_CLEANUP_DMA = 0x02 - } func; - int sarea_priv_offset; - int pcimode; - unsigned int mmio0; - unsigned int mmio1; - unsigned int mmio2; - unsigned int mmio3; - unsigned int buffers_offset; -} drmGAMMAInit; - -extern int drmGAMMAInitDMA( int fd, drmGAMMAInit *info ); -extern int drmGAMMACleanupDMA( int fd ); - -#endif diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/xf86drmI810.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_common.h index 7ead1bbdf..b96104cdf 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/i810/xf86drmI810.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_common.h @@ -1,11 +1,40 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmI810.h,v 3.4 2001/09/27 08:25:04 alanh Exp $ */ +/* i810_common.h -- common header definitions for I810 2D/3D/DRM suite + * + * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Converted to common header format: + * Jens Owen <jens@tungstengraphics.com> + * + * $XFree86$ + * + */ /* WARNING: If you change any of these defines, make sure to change * the kernel include file as well (i810_drm.h) */ -#ifndef _XF86DRI_I810_H_ -#define _XF86DRI_I810_H_ +#ifndef _I810_COMMON_H_ +#define _I810_COMMON_H_ #ifndef _I810_DEFINES_ #define _I810_DEFINES_ diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h index 0f2e6cde2..f52f91562 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h @@ -3,8 +3,8 @@ #ifndef _I810_DRI_ #define _I810_DRI_ -#include <xf86drm.h> -#include <xf86drmI810.h> +#include "xf86drm.h" +#include "i810_common.h" #define I810_MAX_DRAWABLES 256 diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/xf86drmI830.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h index 534861e6b..56b2c449e 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/i810/xf86drmI830.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_common.h @@ -1,6 +1,7 @@ /************************************************************************** Copyright 2001 VA Linux Systems Inc., Fremont, California. +Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas. All Rights Reserved. @@ -29,10 +30,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmI830.h,v 1.2 2001/10/04 18:32:29 alanh Exp $ */ /* Author: Jeff Hartmann <jhartmann@valinux.com> + + Converted to common header format: + Jens Owen <jens@tungstengraphics.com> */ -#ifndef _I830_XF86DRM_H_ -#define _I830_XF86DRM_H_ +#ifndef _I830_COMMON_H_ +#define _I830_COMMON_H_ /* WARNING: These defines must be the same as what the Xserver uses. * if you change them, you must change the defines in the Xserver. diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h index 6c99080af..ac6302681 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h @@ -3,8 +3,8 @@ #ifndef _I830_DRI_H #define _I830_DRI_H -#include <xf86drm.h> -#include <xf86drmI830.h> +#include "xf86drm.h" +#include "i830_common.h" #define I830_MAX_DRAWABLES 256 diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/xf86drmMga.h b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h index c93f3a7f2..6283d979c 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/xf86drmMga.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h @@ -1,7 +1,36 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmMga.h,v 3.6 2001/04/16 15:02:13 tsi Exp $ */ +/* mga_common.h -- common header definitions for MGA 2D/3D/DRM suite + * + * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Converted to common header format: + * Jens Owen <jens@tungstengraphics.com> + * + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmMga.h,v 3.6 2001/04/16 15:02:13 tsi Exp $ + * + */ -#ifndef __XF86DRI_MGA_H__ -#define __XF86DRI_MGA_H__ +#ifndef _MGA_COMMON_H_ +#define _MGA_COMMON_H_ /* * WARNING: If you change any of these defines, make sure to change diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h index 0ab62aa32..9d6d7d47c 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h @@ -24,7 +24,7 @@ * OTHER DEALINGS IN THE SOFTWARE. * * Authors: - * Keith WHitwell <keithw@valinux.com> + * Keith Whitwell <keithw@valinux.com> * Gareth Hughes <gareth@valinux.com> */ @@ -32,7 +32,7 @@ #define __MGA_DRI_H__ #include "xf86drm.h" -#include "xf86drmMga.h" +#include "mga_common.h" #define MGA_DEFAULT_AGP_MODE 1 #define MGA_MAX_AGP_MODE 4 |