[xsrc/trunk]: xsrc/external/mit/xf86-video-nv/dist merge xf86-video-nv 2.1.22

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/117163f7837b
branches:  trunk
changeset: 7123:117163f7837b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 30 17:03:50 2022 +0000

description:
merge xf86-video-nv 2.1.22

diffstat:

 external/mit/xf86-video-nv/dist/README             |  20 --------------------
 external/mit/xf86-video-nv/dist/src/nv_driver.c    |   2 +-
 external/mit/xf86-video-nv/dist/src/nv_include.h   |   4 ++--
 external/mit/xf86-video-nv/dist/src/riva_include.h |   2 +-
 4 files changed, 4 insertions(+), 24 deletions(-)

diffs (62 lines):

diff -r 3909432333cc -r 117163f7837b external/mit/xf86-video-nv/dist/README
--- a/external/mit/xf86-video-nv/dist/README    Sat Jul 30 17:03:10 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-nv - NVIDIA video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/driver/xf86-video-nv
-
-        http://cgit.freedesktop.org/xorg/driver/xf86-video-nv
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
diff -r 3909432333cc -r 117163f7837b external/mit/xf86-video-nv/dist/src/nv_driver.c
--- a/external/mit/xf86-video-nv/dist/src/nv_driver.c   Sat Jul 30 17:03:10 2022 +0000
+++ b/external/mit/xf86-video-nv/dist/src/nv_driver.c   Sat Jul 30 17:03:50 2022 +0000
@@ -100,7 +100,7 @@
 /*
  * This contains the functions needed by the server after loading the
  * driver module.  It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case.  In the static case a
+ * the Module Setup function in the dynamic case.  In the static case a
  * reference to this is compiled in, and this requires that the name of
  * this DriverRec be an upper-case version of the driver name.
  */
diff -r 3909432333cc -r 117163f7837b external/mit/xf86-video-nv/dist/src/nv_include.h
--- a/external/mit/xf86-video-nv/dist/src/nv_include.h  Sat Jul 30 17:03:10 2022 +0000
+++ b/external/mit/xf86-video-nv/dist/src/nv_include.h  Sat Jul 30 17:03:50 2022 +0000
@@ -15,8 +15,8 @@
 #endif
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
+/* PCI IDS */
+#include "pci_ids.h"
 
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
diff -r 3909432333cc -r 117163f7837b external/mit/xf86-video-nv/dist/src/riva_include.h
--- a/external/mit/xf86-video-nv/dist/src/riva_include.h        Sat Jul 30 17:03:10 2022 +0000
+++ b/external/mit/xf86-video-nv/dist/src/riva_include.h        Sat Jul 30 17:03:50 2022 +0000
@@ -14,7 +14,7 @@
 #include "compiler.h"
 
 /* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
+#include "pci_ids.h"
 
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"