rpms/nvidia-304xx-kmod/devel kernel_v3.11.patch, 1.1, 1.2 nvidia-304xx-kmod.spec, 1.2, 1.3
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3282
Modified Files:
kernel_v3.11.patch nvidia-304xx-kmod.spec
Log Message:
* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-3
- patch for 3.12.0 kernel
kernel_v3.11.patch:
nv-linux.h | 4 ++++
nv.c | 4 ++++
2 files changed, 8 insertions(+)
Index: kernel_v3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/kernel_v3.11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel_v3.11.patch 13 Aug 2013 13:15:49 -0000 1.1
+++ kernel_v3.11.patch 25 Sep 2013 20:58:24 -0000 1.2
@@ -12,3 +12,18 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+--- a/kernel/nv.c
++++ b/kernel/nv.c
+@@ -16,8 +16,12 @@
+ #include "rmil.h"
+
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)
++MODULE_LICENSE("GPL");
++#else
+ MODULE_LICENSE("NVIDIA");
+ #endif
++#endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+ #endif
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-304xx-kmod.spec 13 Aug 2013 13:29:07 -0000 1.2
+++ nvidia-304xx-kmod.spec 25 Sep 2013 20:58:24 -0000 1.3
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.108
# 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
@@ -81,6 +81,9 @@
%changelog
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-3
+- patch for 3.12.0 kernel
+
* Tue Aug 13 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.108-2
- build for akmod