summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2006-01-24 16:45:29 +0000
committerAaron Plattner <aplattner@nvidia.com>2006-01-24 16:45:29 +0000
commit61e237eec7193701ce1236e67ebdfe7465b5db8a (patch)
tree616a4a8d7fd51adb2de8a3f6cf259fb03bbfee1b
parent5064f8a903923ca4b819bdf345f8f4c9254bdf3b (diff)
Fix typo in PCI ID (reported by Stefan Dirsch). Patch from Mark Vojkovich
to XFree86 CVS on 2006-01-23.
-rw-r--r--ChangeLog6
-rw-r--r--src/nv_driver.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 88c79fa..e7de348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-24 Aaron Plattner <aplattner@nvidia.com>
+
+ * src/nv_driver.c:
+ Fix typo in PCI ID (reported by Stefan Dirsch).
+ Patch from Mark Vojkovich to XFree86 CVS on 2006-01-23.
+
2006-01-22 Aaron Plattner <aplattner@nvidia.com>
* man/nv.man:
diff --git a/src/nv_driver.c b/src/nv_driver.c
index d08f8d5..35c4115 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: driver/xf86-video-nv/src/nv_driver.c,v 1.19 2006/01/02 01:54:19 aplattner Exp $ */
+/* $XdotOrg: driver/xf86-video-nv/src/nv_driver.c,v 1.20 2006/01/23 00:04:41 aplattner Exp $ */
/* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */
/*
* Copyright 1996-1997 David J. McKay
@@ -29,7 +29,7 @@
/* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen
<jpaana@s2.org> */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.141 2006/01/21 01:17:59 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.142 2006/01/23 18:35:53 mvojkovi Exp $ */
#include "nv_include.h"
@@ -306,7 +306,7 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE0240, "GeForce 6150" },
{ 0x10DE0241, "GeForce 6150 LE" },
- { 0x10DE0241, "GeForce 6100" },
+ { 0x10DE0242, "GeForce 6100" },
{ 0x10DE0244, "GeForce Go 6150" },
{ 0x10DE0247, "GeForce Go 6100" },