Module Name: xsrc
Committed By: mrg
Date: Sat Jul 30 17:03:51 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c nv_include.h
riva_include.h
Removed Files:
xsrc/external/mit/xf86-video-nv/dist: README
Log Message:
merge xf86-video-nv 2.1.22
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-nv/dist/README
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.12 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.13
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.12 Thu Jul 28 06:32:35 2022
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Sat Jul 30 17:03:51 2022
@@ -100,7 +100,7 @@ static const struct pci_id_match NVPciId
/*
* 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.
*/
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.6
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.5 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h Sat Jul 30 17:03:51 2022
@@ -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"
Index: xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.4 xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.5
--- xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h:1.4 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h Sat Jul 30 17:03:51 2022
@@ -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"
