rpms/nvidia-kmod/devel 3.18_kernel.patch, 1.1, 1.2 nvidia-kmod.spec, 1.167, 1.168

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	3.18_kernel.patch nvidia-kmod.spec 
Log Message:
* Tue Oct 21 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:343.22-3
- more 3.18 kernel changes


3.18_kernel.patch:
 nv-drm.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: 3.18_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/3.18_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.18_kernel.patch	21 Oct 2014 11:31:37 -0000	1.1
+++ 3.18_kernel.patch	21 Oct 2014 12:40:06 -0000	1.2
@@ -10,3 +10,14 @@
  
  extern nv_linux_state_t *nv_linux_devices;
  
+@@ -124,6 +127,10 @@ static struct drm_driver nv_drm_driver =
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++    .set_busid = drm_pci_set_busid,
++#endif
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- nvidia-kmod.spec	21 Oct 2014 11:31:37 -0000	1.167
+++ nvidia-kmod.spec	21 Oct 2014 12:40:06 -0000	1.168
@@ -9,7 +9,7 @@
 Epoch:         1
 Version:       343.22
 # Taken over by kmodtool
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Tue Oct 21 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:343.22-3
+- more 3.18 kernel changes
+
 * Tue Oct 21 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:343.22-2
 - Patch for 3.18 kernel