From fe564263d97e370817fc862e5c8ead09bfb70b58 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 3 Mar 2004 12:12:23 +0000 Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 --- src/nv_const.h | 2 +- src/nv_cursor.c | 2 +- src/nv_dac.c | 2 +- src/nv_dga.c | 2 +- src/nv_dma.h | 2 +- src/nv_driver.c | 2 +- src/nv_hw.c | 2 +- src/nv_include.h | 2 +- src/nv_local.h | 2 +- src/nv_proto.h | 2 +- src/nv_setup.c | 2 +- src/nv_shadow.c | 2 +- src/nv_type.h | 2 +- src/nv_video.c | 2 +- src/nv_xaa.c | 2 +- src/riva_const.h | 2 +- src/riva_cursor.c | 2 +- src/riva_dac.c | 2 +- src/riva_dga.c | 2 +- src/riva_driver.c | 2 +- src/riva_hw.c | 2 +- src/riva_hw.h | 2 +- src/riva_include.h | 2 +- src/riva_local.h | 2 +- src/riva_proto.h | 2 +- src/riva_setup.c | 2 +- src/riva_shadow.c | 2 +- src/riva_tbl.h | 2 +- src/riva_type.h | 2 +- src/riva_xaa.c | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/nv_const.h b/src/nv_const.h index f4ab437..bd01635 100644 --- a/src/nv_const.h +++ b/src/nv_const.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_const.h,v 1.7 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_const.h,v 1.6 2001/12/07 00:09:55 mvojkovi Exp $ */ #ifndef __NV_CONST_H__ #define __NV_CONST_H__ diff --git a/src/nv_cursor.c b/src/nv_cursor.c index 85ac42a..577b44d 100644 --- a/src/nv_cursor.c +++ b/src/nv_cursor.c @@ -37,7 +37,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c,v 1.12 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c,v 1.11 2002/11/26 23:41:58 mvojkovi Exp $ */ #include "nv_include.h" diff --git a/src/nv_dac.c b/src/nv_dac.c index 320bf98..4b3f528 100644 --- a/src/nv_dac.c +++ b/src/nv_dac.c @@ -37,7 +37,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.38 2004/01/06 22:47:06 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.37 2003/09/08 20:00:27 mvojkovi Exp $ */ #include "nv_include.h" diff --git a/src/nv_dga.c b/src/nv_dga.c index d4bf3ff..baafbfe 100644 --- a/src/nv_dga.c +++ b/src/nv_dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dga.c,v 1.12 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dga.c,v 1.11 2002/01/25 21:56:06 tsi Exp $ */ #include "nv_local.h" #include "nv_include.h" diff --git a/src/nv_dma.h b/src/nv_dma.h index 6506068..15b222f 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -38,7 +38,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h,v 1.2 2003/07/31 21:41:26 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ #define SURFACE_FORMAT 0x00000300 #define SURFACE_FORMAT_DEPTH8 0x00000001 diff --git a/src/nv_driver.c b/src/nv_driver.c index aa3b3ec..324b467 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -24,7 +24,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.123 2004/01/13 19:03:28 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.122 2004/01/10 22:31:53 mvojkovi Exp $ */ #include "nv_include.h" diff --git a/src/nv_hw.c b/src/nv_hw.c index bc365b7..67e3b5b 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.5 2004/01/06 22:47:07 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.4 2003/11/03 05:11:25 tsi Exp $ */ #include "nv_local.h" #include "compiler.h" diff --git a/src/nv_include.h b/src/nv_include.h index 2d4465b..acd3543 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.11 2001/12/07 00:09:56 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.9 2000/10/06 12:31:03 eich Exp $ */ #ifndef __NV_INCLUDE_H__ #define __NV_INCLUDE_H__ diff --git a/src/nv_local.h b/src/nv_local.h index f9a8668..ed58ef4 100644 --- a/src/nv_local.h +++ b/src/nv_local.h @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.9 2003/11/03 05:11:25 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.8tsi Exp $ */ #ifndef __NV_LOCAL_H__ #define __NV_LOCAL_H__ diff --git a/src/nv_proto.h b/src/nv_proto.h index f526a71..a074346 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.10 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.9 2003/05/04 01:20:52 mvojkovi Exp $ */ #ifndef __NV_PROTO_H__ #define __NV_PROTO_H__ diff --git a/src/nv_setup.c b/src/nv_setup.c index 854146b..e399904 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -37,7 +37,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.40 2004/02/07 22:56:05 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.39 2003/11/07 23:56:28 mvojkovi Exp $ */ #include "nv_include.h" diff --git a/src/nv_shadow.c b/src/nv_shadow.c index 5effc79..564220a 100644 --- a/src/nv_shadow.c +++ b/src/nv_shadow.c @@ -2,7 +2,7 @@ Copyright (c) 1999, The XFree86 Project Inc. Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.6 2001/01/22 21:32:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.5 2000/03/13 18:49:29 mvojkovi Exp $ */ #include "nv_local.h" #include "nv_include.h" diff --git a/src/nv_type.h b/src/nv_type.h index 1d62f54..5cae38d 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.45 2004/01/06 22:47:07 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.44 2003/09/08 20:00:27 mvojkovi Exp $ */ #ifndef __NV_STRUCT_H__ #define __NV_STRUCT_H__ diff --git a/src/nv_video.c b/src/nv_video.c index 3b2eb5b..66f49c0 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.21 2003/11/10 18:22:24 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.20tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/nv_xaa.c b/src/nv_xaa.c index e237abb..3bf6b16 100644 --- a/src/nv_xaa.c +++ b/src/nv_xaa.c @@ -37,7 +37,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c,v 1.34 2003/10/15 20:28:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c,v 1.33 2003/09/21 00:17:34 mvojkovi Exp $ */ #include "nv_include.h" #include "xaalocal.h" diff --git a/src/riva_const.h b/src/riva_const.h index 31dc8d5..c3b9794 100644 --- a/src/riva_const.h +++ b/src/riva_const.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_const.h,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_const.h $ */ #ifndef __RIVA_CONST_H__ #define __RIVA_CONST_H__ diff --git a/src/riva_cursor.c b/src/riva_cursor.c index 7dcaed9..835a4d7 100644 --- a/src/riva_cursor.c +++ b/src/riva_cursor.c @@ -23,7 +23,7 @@ /* Rewritten with reference from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_cursor.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_cursor.c $ */ #include "riva_include.h" diff --git a/src/riva_dac.c b/src/riva_dac.c index 348e526..7118ae1 100644 --- a/src/riva_dac.c +++ b/src/riva_dac.c @@ -23,7 +23,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dac.c,v 1.2 2003/09/16 00:17:46 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dac.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ #include "riva_include.h" diff --git a/src/riva_dga.c b/src/riva_dga.c index cbe4224..6e5afd8 100644 --- a/src/riva_dga.c +++ b/src/riva_dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dga.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/riva/riva_dga.c $ */ #include "riva_local.h" #include "riva_include.h" diff --git a/src/riva_driver.c b/src/riva_driver.c index 0b8a06e..daf7b9c 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -23,7 +23,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.6 2004/01/10 22:31:53 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.5 2003/11/03 05:11:26 tsi Exp $ */ #include "riva_include.h" diff --git a/src/riva_hw.c b/src/riva_hw.c index bf6885d..fbd9858 100644 --- a/src/riva_hw.c +++ b/src/riva_hw.c @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v 1.52 2003/11/03 05:11:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v 1.51tsi Exp $ */ #include "riva_local.h" #include "compiler.h" diff --git a/src/riva_hw.h b/src/riva_hw.h index ec2b90b..0680d7d 100644 --- a/src/riva_hw.h +++ b/src/riva_hw.h @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.h,v 1.26 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.h,v 1.25 2003/05/04 01:20:52 mvojkovi Exp $ */ #ifndef __RIVA_HW_H__ #define __RIVA_HW_H__ diff --git a/src/riva_include.h b/src/riva_include.h index e64d78f..d5994d2 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_include.h,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_include.h $ */ #ifndef __RIVA_INCLUDE_H__ #define __RIVA_INCLUDE_H__ diff --git a/src/riva_local.h b/src/riva_local.h index efe0c7e..b060acc 100644 --- a/src/riva_local.h +++ b/src/riva_local.h @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_local.h,v 1.2 2003/11/03 05:11:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_local.h,v 1.1tsi Exp $ */ #ifndef __RIVA_LOCAL_H__ #define __RIVA_LOCAL_H__ diff --git a/src/riva_proto.h b/src/riva_proto.h index 75f5d01..bff07a2 100644 --- a/src/riva_proto.h +++ b/src/riva_proto.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_proto.h,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_proto.h $ */ #ifndef __RIVA_PROTO_H__ #define __RIVA_PROTO_H__ diff --git a/src/riva_setup.c b/src/riva_setup.c index 6a0d32e..7e8b874 100644 --- a/src/riva_setup.c +++ b/src/riva_setup.c @@ -23,7 +23,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_setup.c,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_setup.c $ */ #include "riva_include.h" diff --git a/src/riva_shadow.c b/src/riva_shadow.c index 90f1f12..a858f7c 100644 --- a/src/riva_shadow.c +++ b/src/riva_shadow.c @@ -2,7 +2,7 @@ Copyright (c) 1999, The XFree86 Project Inc. Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_shadow.c,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_shadow.c $ */ #include "riva_local.h" #include "riva_include.h" diff --git a/src/riva_tbl.h b/src/riva_tbl.h index bb2a329..4156c80 100644 --- a/src/riva_tbl.h +++ b/src/riva_tbl.h @@ -36,7 +36,7 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_tbl.h,v 1.10 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_tbl.h,v 1.9 2002/01/30 01:35:03 mvojkovi Exp $ */ /* diff --git a/src/riva_type.h b/src/riva_type.h index 7913128..204c758 100644 --- a/src/riva_type.h +++ b/src/riva_type.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_type.h,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_type.h $ */ #ifndef __Riva_STRUCT_H__ #define __Riva_STRUCT_H__ diff --git a/src/riva_xaa.c b/src/riva_xaa.c index 240e9ec..a7d30a0 100644 --- a/src/riva_xaa.c +++ b/src/riva_xaa.c @@ -40,7 +40,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_xaa.c,v 1.1 2003/07/31 20:24:31 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_xaa.c $ */ #include "riva_include.h" #include "xaalocal.h" -- cgit v1.2.3