diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
| commit | 35a5cf103e9e41d178f980f685307f8c8063a006 (patch) | |
| tree | 17ffd25f9890fc2a3187ef283ed3466d18eb166a /src/i810_hwmc.c | |
| parent | bec47f9369b6f02ce4537ab1ac547ba933609edc (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, with
the following notes:
- Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to insecurity.
- VIA driver converted to new drmContext and drmHandle names.
- Radeon driver merge conflicted in many places, and MergedFB at least could
probably use some checking at this point.
Diffstat (limited to 'src/i810_hwmc.c')
| -rw-r--r-- | src/i810_hwmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c index 8c9c3050..4a154d76 100644 --- a/src/i810_hwmc.c +++ b/src/i810_hwmc.c @@ -32,7 +32,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. * * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c,v 1.4 2002/09/11 00:29:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c,v 1.3 2001/12/04 21:17:56 tsi Exp $ */ #include "xf86.h" |