nvidia-kmod/devel/3.6_kernel.patch

--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.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);
Revision:	1.2
Committed:	Tue Jul 31 19:18:38 2012 UTC (9 months, 2 weeks ago) by leigh123linux
Branch:	MAIN
CVS Tags:	nvidia-kmod-304_37-1_fc18, F-18-split, nvidia-kmod-304_30-2_fc18, nvidia-kmod-304_32-2_fc18, nvidia-kmod-304_32-1_fc18
Changes since 1.1:	+5 -2 lines
Log Message:	* Tue Jul 31 2012 Leigh Scott <leigh123linux@googlemail.com> - 1:304.30-2 - add some conditionals to the 3.6 kernel patch
Line	File contents
1	--- a/kernel/nv-acpi.c
2	+++ b/kernel/nv-acpi.c
3	@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
4	if (pNvAcpiObject->notify_handler_installed)
5	{
6	// no status returned for this function
7	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
8	+ acpi_os_wait_events_complete();
9	+#else
10	acpi_os_wait_events_complete(NULL);
11	+#endif
12
13	// remove event notifier
14	status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);