Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2630.git;a=commitdiff;h=94c6a777884861d7a7b27a906f6216edf1a6891e

commit 94c6a777884861d7a7b27a906f6216edf1a6891e
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun Jun 14 00:44:54 2009 +0200

nvidia-96xx-96.43.11-5-i686

- add nvidia-2.6.30.diff

diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild 
b/source/x11-extra/nvidia-96xx/FrugalBuild
index b93a2d5..39f48e2 100644
--- a/source/x11-extra/nvidia-96xx/FrugalBuild
+++ b/source/x11-extra/nvidia-96xx/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=nvidia-96xx
pkgver=96.43.11
-pkgrel=4
+pkgrel=5
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="96.43.xx"
Finclude nvidia
@@ -11,3 +11,5 @@ case "$_F_nvidia_arch" in
x86)    sha1sums=('619d5b5850cfb6c35dd74b048d23de0c4e267166');;
x86_64) sha1sums=('3a3103319b184af04341da877049584f4db52130');;
esac
+source=(${sour...@]} nvidia-2.6.30.diff)
+sha1sums=(${sha1su...@]} '3dc0b85e14462abc6faf9230e9fb81bebea6d2ca')
diff --git a/source/x11-extra/nvidia-96xx/nvidia-2.6.30.diff 
b/source/x11-extra/nvidia-96xx/nvidia-2.6.30.diff
new file mode 100644
index 0000000..e19e743
--- /dev/null
+++ b/source/x11-extra/nvidia-96xx/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 "nv_compiler.h"
+ #include "os-agp.h"
+ #include "nv-vm.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

Reply via email to