rpms/nvidia-173xx-kmod/F-17 3.6_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.65, 1.66

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	nvidia-173xx-kmod.spec 
Added Files:
	3.6_kernel.patch 
Log Message:
* Mon Oct 01 2012 Leigh Scott <leigh123linux at googlemail.com> - 173.14.35-2
- patch for 3.6 kernel


3.6_kernel.patch:
 nvacpi.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE 3.6_kernel.patch ---
--- a/usr/src/nv/nvacpi.c
+++ b/usr/src/nv/nvacpi.c
@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
     if (pNvAcpiObject->notify_handler_installed)
     {
         // no status returned for this function
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+        acpi_os_wait_events_complete();
+#else
         acpi_os_wait_events_complete(NULL);
+#endif
 
         // remove event notifier
         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);


Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/nvidia-173xx-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- nvidia-173xx-kmod.spec	27 Sep 2012 19:10:32 -0000	1.65
+++ nvidia-173xx-kmod.spec	1 Oct 2012 14:28:55 -0000	1.66
@@ -3,12 +3,12 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
 
 Name:          nvidia-173xx-kmod
 Version:       173.14.35
 # Taken over by kmodtool
-Release:       1%{?dist}.13
+Release:       2%{?dist}
 Summary:       NVIDIA 173xx display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -23,6 +23,8 @@
 # </switch me>
 #http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
 
+Patch0:        3.6_kernel.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -46,12 +48,12 @@
 %setup -q -c -T -a 0
 
 # patch loop
-#for arch in x86 x64
-#do
-#    pushd nvidiapkg-${arch}
-# empty
-#    popd
-#done
+for arch in x86 x64
+do
+    pushd nvidiapkg-${arch}
+%patch0 -p1
+    popd
+done
 
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -93,6 +95,9 @@
 
 
 %changelog
+* Mon Oct 01 2012 Leigh Scott <leigh123linux at googlemail.com> - 173.14.35-2
+- patch for 3.6 kernel
+
 * Thu Sep 27 2012 Nicolas Chauvet <kwizart at gmail.com> - 173.14.35-1.13
 - Rebuilt for updated kernel