From dd7c85f108d01d207248300019e88d56012c33c9 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed, 30 Oct 2002 12:52:06 +0000
Subject: [PATCH] 441. Import Mesa-4.0.4, and resync with the DRI trunk (DRI
 Project).

---
 hw/kdrive/i810/i810_cursor.c | 4 ++--
 hw/kdrive/i810/i810_reg.h    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c
index a346912d5..e58571087 100644
--- a/hw/kdrive/i810/i810_cursor.c
+++ b/hw/kdrive/i810/i810_cursor.c
@@ -60,13 +60,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */
 
 /* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */
 
 /*
  * Authors:
- *   Keith Whitwell <keithw@precisioninsight.com>
+ *   Keith Whitwell <keith@tungstengraphics.com>
  *   Pontus Lidman <pontus.lidman@nokia.com>
  *
  */
diff --git a/hw/kdrive/i810/i810_reg.h b/hw/kdrive/i810/i810_reg.h
index 2f8e67f63..f1cc1ddf5 100644
--- a/hw/kdrive/i810/i810_reg.h
+++ b/hw/kdrive/i810/i810_reg.h
@@ -57,11 +57,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_reg.h,v 1.4 2000/09/26 15:57:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
 
 /*
  * Authors:
- *   Keith Whitwell <keithw@precisioninsight.com>
+ *   Keith Whitwell <keith@tungstengraphics.com>
  *   Pontus Lidman <pontus.lidman@nokia.com>
  *
  *   based on the i740 driver by