rpms/nvidia-kmod/devel 3.6_kernel.patch, 1.1, 1.2 nvidia-kmod.spec, 1.101, 1.102
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31211
Modified Files:
3.6_kernel.patch nvidia-kmod.spec
Log Message:
* Tue Jul 31 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-2
- add some conditionals to the 3.6 kernel patch
3.6_kernel.patch:
nv-acpi.c | 4 ++++
1 file changed, 4 insertions(+)
Index: 3.6_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/3.6_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 3.6_kernel.patch 31 Jul 2012 17:41:18 -0000 1.1
+++ 3.6_kernel.patch 31 Jul 2012 19:18:38 -0000 1.2
@@ -1,11 +1,14 @@
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
-@@ -300,7 +300,7 @@ static int nv_acpi_remove(struct acpi_de
+@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)
{
// no status returned for this function
-- acpi_os_wait_events_complete(NULL);
++#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-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- nvidia-kmod.spec 31 Jul 2012 17:41:19 -0000 1.101
+++ nvidia-kmod.spec 31 Jul 2012 19:18:38 -0000 1.102
@@ -9,7 +9,7 @@
Epoch: 1
Version: 304.30
# 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
@@ -87,6 +87,9 @@
%changelog
+* Tue Jul 31 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-2
+- add some conditionals to the 3.6 kernel patch
+
* Tue Jul 31 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.30-1
- Update to 304.30