rpms/nvidia-kmod/devel nv-linux-arm.patch, 1.1, 1.2 nvidia_3.14_kernel.patch, 1.1, 1.2

Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5586 Modified Files: nv-linux-arm.patch nvidia_3.14_kernel.patch Log Message: more patch tweaks nv-linux-arm.patch: nv-linux.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: nv-linux-arm.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nv-linux-arm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nv-linux-arm.patch 15 Dec 2013 12:44:06 -0000 1.1 +++ nv-linux-arm.patch 10 Feb 2014 16:05:34 -0000 1.2 @@ -1,7 +1,7 @@ diff -up nvidiapkg-armv7hl/kernel/nv-linux.h.arm nvidiapkg-armv7hl/kernel/nv-linux.h --- nvidiapkg-armv7hl/kernel/nv-linux.h.arm 2013-10-30 20:03:30.000000000 -0400 +++ nvidiapkg-armv7hl/kernel/nv-linux.h 2013-12-15 06:57:24.857474273 -0500 -@@ -218,7 +218,8 @@ RM_STATUS nvos_forward_error_to_cray(str +@@ -225,7 +225,8 @@ RM_STATUS nvos_forward_error_to_cray(str * NVIDIA graphics driver has no way of knowing and is unlikely * to work correctly. */ nvidia_3.14_kernel.patch: nv-acpi.c | 7 +++++++ nv-linux.h | 3 +++ uvm/nvidia_uvm_common.c | 4 ++++ 3 files changed, 14 insertions(+) Index: nvidia_3.14_kernel.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia_3.14_kernel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nvidia_3.14_kernel.patch 8 Feb 2014 16:44:36 -0000 1.1 +++ nvidia_3.14_kernel.patch 10 Feb 2014 16:05:35 -0000 1.2 @@ -24,24 +24,25 @@ status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); --- a/kernel/nv-linux.h +++ b/kernel/nv-linux.h -@@ -276,6 +276,11 @@ extern int nv_pat_mode; +@@ -276,6 +276,9 @@ extern int nv_pat_mode; #if !defined(NV_VMWARE) && defined(CONFIG_ACPI) #include <acpi/acpi.h> #include <acpi/acpi_drivers.h> -+ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#include <acpi/acpi_bus.h> +#endif -+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID) #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1 #endif --- a/kernel/uvm/nvidia_uvm_common.c +++ b/kernel/uvm/nvidia_uvm_common.c -@@ -272,5 +272,5 @@ static void __exit uvm_exit(void) +@@ -272,5 +272,9 @@ static void __exit uvm_exit(void) module_init(uvm_init); module_exit(uvm_exit); --MODULE_LICENSE("MIT"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +MODULE_LICENSE("GPL"); ++#else + MODULE_LICENSE("MIT"); ++#endif MODULE_INFO(supported, "external");