rpms/nvidia-304xx-kmod/devel nvidia-304xx-kmod.spec, 1.13, 1.14 nvidia_3.13_kernel.patch, 1.2, 1.3
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6968
Modified Files:
nvidia-304xx-kmod.spec nvidia_3.13_kernel.patch
Log Message:
* Tue Jan 21 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-4
- make more changes to 3.13 kernel patch
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nvidia-304xx-kmod.spec 13 Jan 2014 11:07:03 -0000 1.13
+++ nvidia-304xx-kmod.spec 21 Jan 2014 22:40:01 -0000 1.14
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.117
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Tue Jan 21 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-4
+- make more changes to 3.13 kernel patch
+
* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
- fix 3.13.0 kernel patch for EFI systems with CSM disabled
nvidia_3.13_kernel.patch:
nv-acpi.c | 3 +++
1 file changed, 3 insertions(+)
Index: nvidia_3.13_kernel.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia_3.13_kernel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia_3.13_kernel.patch 13 Jan 2014 11:07:03 -0000 1.2
+++ nvidia_3.13_kernel.patch 21 Jan 2014 22:40:01 -0000 1.3
@@ -1,16 +1,5 @@
--- 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 int nv_acpi_add (struct acpi_device *);
@@ -299,7 +299,10 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)