diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/mga')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h (renamed from xc/programs/Xserver/hw/xfree86/drivers/mga/xf86drmMga.h) | 35 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h | 4 |
2 files changed, 34 insertions, 5 deletions
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 |