Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7039
Modified Files:
nvidia_3.13_kernel.patch
Log Message:
more patch tweaks
nvidia_3.13_kernel.patch:
nv-acpi.c | 7 +++++++
uvm/nvidia_uvm_linux.h | 10 ++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
Index: nvidia_3.13_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia_3.13_kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia_3.13_kernel.patch 25 Jan 2014 12:18:19 -0000 1.1
+++ nvidia_3.13_kernel.patch 10 Feb 2014 16:13:15 -0000 1.2
@@ -1,5 +1,16 @@
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
+@@ -15,6 +15,10 @@
+ #include "nv-linux.h"
+ #include "nv-reg.h"
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
++#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
++#endif
++
+ #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
+ static RM_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32,
NvU32 *);
+ static RM_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32,
NvU32 *);
@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)