rpms/nvidia-173xx-kmod/F-18 fix-build-with-linux-3.11.patch, 1.1, 1.2 nvidia-173xx-kmod.spec, 1.100, 1.101

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11922

Modified Files:
	fix-build-with-linux-3.11.patch nvidia-173xx-kmod.spec 
Log Message:
* Thu Oct 10 2013 Leigh Scott <leigh123linux at googlemail.com> - 173.14.37-4
- redo patch


fix-build-with-linux-3.11.patch:
 b/usr/src/nv/nv-i2c.c     |   13 -
 b/usr/src/nv/nv-linux.h   |    1 
 b/usr/src/nv/nv.c         |  376 ++++++++++++++++++++++++++++------------------
 usr/src/nv/os-interface.c |    4 
 4 files changed, 245 insertions(+), 149 deletions(-)

Index: fix-build-with-linux-3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/fix-build-with-linux-3.11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-build-with-linux-3.11.patch	10 Oct 2013 19:20:48 -0000	1.1
+++ fix-build-with-linux-3.11.patch	10 Oct 2013 19:50:17 -0000	1.2
@@ -43,12 +43,15 @@
  #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
 --- a/usr/src/nv/os-interface.c
 +++ b/usr/src/nv/os-interface.c
-@@ -292,7 +292,7 @@
+@@ -292,7 +292,11 @@
  
  NvU64 NV_API_CALL os_get_system_memory_size(void)
  {
--    return ((NvU64) num_physpages * PAGE_SIZE) / RM_PAGE_SIZE;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
 +    return ((NvU64) get_num_physpages() * PAGE_SIZE) / RM_PAGE_SIZE;
++#else
+     return ((NvU64) num_physpages * PAGE_SIZE) / RM_PAGE_SIZE;
++#endif
  }
  
  //


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18/nvidia-173xx-kmod.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- nvidia-173xx-kmod.spec	10 Oct 2013 19:20:48 -0000	1.100
+++ nvidia-173xx-kmod.spec	10 Oct 2013 19:50:17 -0000	1.101
@@ -8,7 +8,7 @@
 Name:          nvidia-173xx-kmod
 Version:       173.14.37
 # Taken over by kmodtool
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Thu Oct 10 2013 Leigh Scott <leigh123linux at googlemail.com> - 173.14.37-4
+- redo patch
+
 * Thu Oct 10 2013 Leigh Scott <leigh123linux at googlemail.com> - 173.14.37-3
 - patch for 3.11 kernel