Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2630.git;a=commitdiff;h=449e19288435cdfe5858ded90dee3e788fdd5887
commit 449e19288435cdfe5858ded90dee3e788fdd5887
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Jun 14 00:33:11 2009 +0200
nvidia-173xx-173.14.18-5-i686
- add nvidia-2.6.30.diff from hermier
diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild
b/source/x11-extra/nvidia-173xx/FrugalBuild
index a838eca..75b2075 100644
--- a/source/x11-extra/nvidia-173xx/FrugalBuild
+++ b/source/x11-extra/nvidia-173xx/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=nvidia-173xx
pkgver=173.14.18
-pkgrel=4
+pkgrel=5
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="173.14.xx"
Finclude nvidia
@@ -11,3 +11,5 @@ case "$_F_nvidia_arch" in
x86) sha1sums=('8a5c537d08517dff59e854991a14486a02f970cc');;
x86_64) sha1sums=('06761c527ab5896b142c9e642315fb58bdbc111c');;
esac
+source=(${sour...@]} nvidia-2.6.30.diff)
+sha1sums=(${sha1su...@]} 'dc16a860c243375359884c2d3419ef65202255ce')
diff --git a/source/x11-extra/nvidia-173xx/nvidia-2.6.30.diff
b/source/x11-extra/nvidia-173xx/nvidia-2.6.30.diff
new file mode 100644
index 0000000..09a4149
--- /dev/null
+++ b/source/x11-extra/nvidia-173xx/nvidia-2.6.30.diff
@@ -0,0 +1,103 @@
+--- nvidia/usr/src/nv/nv.c.orig
++++ nvidia/usr/src/nv/nv.c
+@@ -15,6 +15,7 @@
+ #include "os-agp.h"
+ #include "nv-vm.h"
+ #include "nv-reg.h"
++#include <linux/version.h>
+
+ #ifdef MODULE_ALIAS_CHARDEV_MAJOR
+ MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
+@@ -499,10 +500,12 @@
+ * Set the module owner to ensure that the reference
+ * count reflects accesses to the proc files.
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ proc_nvidia->owner = THIS_MODULE;
+ proc_nvidia_cards->owner = THIS_MODULE;
+ proc_nvidia_warnings->owner = THIS_MODULE;
+
++#endif
+ for (j = 0; j < num_nv_devices; j++)
+ {
+ nvl = &nv_linux_devices[j];
+@@ -521,7 +524,9 @@
+
+ entry->data = nv;
+ entry->read_proc = nv_kern_read_cardinfo;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+
+ if (nvos_find_agp_capability(dev)) {
+ /*
+@@ -534,7 +539,9 @@
+ goto failed;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+ proc_nvidia_agp = entry;
+
+ entry = create_proc_entry("status", flags, proc_nvidia_agp);
+@@ -545,7 +552,9 @@
+
+ entry->data = nv;
+ entry->read_proc = nv_kern_read_status;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+
+ entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
+ if (!entry) {
+@@ -555,8 +564,9 @@
+
+ entry->data = NULL;
+ entry->read_proc = nv_kern_read_agpinfo;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
+-
++#endif
+ entry = create_proc_entry("card", flags, proc_nvidia_agp);
+ if (!entry) {
+ NV_PCI_DEV_PUT(dev);
+@@ -565,7 +575,9 @@
+
+ entry->data = nv;
+ entry->read_proc = nv_kern_read_agpinfo;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+ }
+
+ NV_PCI_DEV_PUT(dev);
+@@ -576,14 +588,18 @@
+ goto failed;
+
+ entry->read_proc = nv_kern_read_version;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+
+ entry = create_proc_entry("registry", flags, proc_nvidia);
+ if (!entry)
+ goto failed;
+
+ entry->read_proc = nv_kern_read_registry;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+
+ return;
+
+@@ -610,7 +626,9 @@
+
+ entry->data = (void *)message;
+ entry->read_proc = nv_kern_read_warning;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ entry->owner = THIS_MODULE;
++#endif
+ #endif
+ }
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
