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_dri.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_dri.c')
| -rw-r--r-- | src/i810_dri.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i810_dri.c b/src/i810_dri.c index 787eef56..a09ba6b7 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.40 2003/07/09 01:45:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v 1.41 2003/09/24 02:43:23 dawes Exp $ */ /* * Reformatted with GNU indent (2.2.8), using the following options: * @@ -525,7 +525,7 @@ I810DRIScreenInit(ScreenPtr pScreen) drmAgpAlloc(pI810->drmSubFD, 4096 * 1024, 1, NULL, &dcacheHandle); pI810->dcacheHandle = dcacheHandle; - xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] dcacheHandle : %p\n", + xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] dcacheHandle : 0x%lx\n", dcacheHandle); #define Elements(x) sizeof(x)/sizeof(*x) |