rpms/nvidia-kmod/devel .cvsignore, 1.62, 1.63 nvidia-kmod.spec, 1.154, 1.155 nvidia_3.14_kernel.patch, 1.3, 1.4 sources, 1.65, 1.66

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3408

Modified Files:
	.cvsignore nvidia-kmod.spec nvidia_3.14_kernel.patch sources 
Log Message:
* Tue Apr 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:337.12-1
- Update to 337.12



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	3 Mar 2014 15:09:28 -0000	1.62
+++ .cvsignore	8 Apr 2014 14:54:26 -0000	1.63
@@ -1 +1 @@
-nvidia-kmod-data-334.21.tar.xz
+nvidia-kmod-data-337.12.tar.xz


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- nvidia-kmod.spec	3 Mar 2014 15:09:28 -0000	1.154
+++ nvidia-kmod.spec	8 Apr 2014 14:54:26 -0000	1.155
@@ -7,7 +7,7 @@
 
 Name:          nvidia-kmod
 Epoch:         1
-Version:       334.21
+Version:       337.12
 # Taken over by kmodtool
 Release:       1%{?dist}
 Summary:       NVIDIA display driver kernel module
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Tue Apr 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:337.12-1
+- Update to 337.12
+
 * Mon Mar 03 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:334.21-1
 - Update to 334.21
 

nvidia_3.14_kernel.patch:
 nvidia_uvm_common.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: nvidia_3.14_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia_3.14_kernel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia_3.14_kernel.patch	3 Mar 2014 15:09:28 -0000	1.3
+++ nvidia_3.14_kernel.patch	8 Apr 2014 14:54:26 -0000	1.4
@@ -1,18 +1,6 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -276,6 +276,9 @@ extern int nv_pat_mode;
- #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
- #include <acpi/acpi.h>
- #include <acpi/acpi_drivers.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
-+#include <acpi/acpi_bus.h>
-+#endif
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif
 --- a/kernel/uvm/nvidia_uvm_common.c
 +++ b/kernel/uvm/nvidia_uvm_common.c
-@@ -272,5 +272,9 @@ static void __exit uvm_exit(void)
+@@ -275,5 +275,9 @@ static void __exit uvm_exit(void)
  
  module_init(uvm_init);
  module_exit(uvm_exit);


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	3 Mar 2014 15:09:28 -0000	1.65
+++ sources	8 Apr 2014 14:54:26 -0000	1.66
@@ -1 +1 @@
-fa4dfdd31d1c0e68af241114e01d11ff  nvidia-kmod-data-334.21.tar.xz
+f0ec46ef37e8fe1a3c45839018bd20a1  nvidia-kmod-data-337.12.tar.xz