rpms/nvidia-kmod/devel 3.18_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.166, 1.167

[Leigh Scott]

Author: leigh123linux

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

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


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

--- NEW FILE 3.18_kernel.patch ---
--- a/kernel/nv-drm.c	2014-09-11 23:33:06.000000000 +0100
+++ b/kernel/nv-drm.c	2014-10-21 12:12:59.472379677 +0100
@@ -17,6 +17,9 @@
 #if defined(NV_DRM_AVAILABLE)
 
 #include <drm/drmP.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+#include <drm/drm_gem.h>
+#endif
 
 extern nv_linux_state_t *nv_linux_devices;
 


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- nvidia-kmod.spec	19 Sep 2014 12:32:04 -0000	1.166
+++ nvidia-kmod.spec	21 Oct 2014 11:31:37 -0000	1.167
@@ -9,7 +9,7 @@
 Epoch:         1
 Version:       343.22
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -17,6 +17,7 @@
 
 Source11:      nvidia-kmodtool-excludekernel-filterfile
 Patch0:        nv-linux-arm.patch
+Patch1:        3.18_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@
 tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
 # patch loop
 %patch0 -p1
+%patch1 -p1
 
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -84,6 +86,9 @@
 
 
 %changelog
+* Tue Oct 21 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:343.22-2
+- Patch for 3.18 kernel
+
 * Fri Sep 19 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:343.22-1
 - Update to 343.22