Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2630.git;a=commitdiff;h=f24af5398c95be46678c09a74eda21a50e193502
commit f24af5398c95be46678c09a74eda21a50e193502 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Jun 14 00:40:43 2009 +0200 nvidia-71xx-71.86.09-5-i686 - add nvidia-2.6.30.diff from hermier diff --git a/source/x11-extra/nvidia-71xx/FrugalBuild b/source/x11-extra/nvidia-71xx/FrugalBuild index 8f7107d..0bc46c6 100644 --- a/source/x11-extra/nvidia-71xx/FrugalBuild +++ b/source/x11-extra/nvidia-71xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-71xx pkgver=71.86.09 -pkgrel=4 +pkgrel=5 archs=('i686' 'x86_64' '!ppc') _F_nvidia_legacyver="71.86.xx" Finclude nvidia @@ -11,3 +11,5 @@ case "$_F_nvidia_arch" in x86) sha1sums=('5ce6c5ba1fd07e922bb4e67d36a461ed09af4b42');; x86_64) sha1sums=('8df93e50e5fc182290838db5f762763c0582bc9c');; esac +source=(${sour...@]} nvidia-2.6.30.diff) +sha1sums=(${sha1su...@]} '3dc0b85e14462abc6faf9230e9fb81bebea6d2ca') diff --git a/source/x11-extra/nvidia-71xx/nvidia-2.6.30.diff b/source/x11-extra/nvidia-71xx/nvidia-2.6.30.diff new file mode 100644 index 0000000..e19e743 --- /dev/null +++ b/source/x11-extra/nvidia-71xx/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