diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-12-05 17:32:37 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-12-05 17:32:37 +0000 |
| commit | 7e202e7d57181ab08b9cdba5359992401a3726f1 (patch) | |
| tree | 5a1cf2e6c00f5d09bd33afa62f0d663f3ebf6198 /x11-drivers | |
| parent | Version bump to 1.0.9631 for bug #157194. This should also close bug #105656... (diff) | |
| download | gentoo-2-7e202e7d57181ab08b9cdba5359992401a3726f1.tar.gz gentoo-2-7e202e7d57181ab08b9cdba5359992401a3726f1.tar.bz2 gentoo-2-7e202e7d57181ab08b9cdba5359992401a3726f1.zip | |
Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978.
(Portage version: 2.1.2_rc2-r2)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch | 59 |
2 files changed, 33 insertions, 32 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 748f1bb9051b..2329af3e359c 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.32 2006/12/05 17:27:39 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.33 2006/12/05 17:32:37 wolf31o2 Exp $ + + 05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> + files/NVIDIA_kernel-2.6.19.patch: + Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978. *nvidia-drivers-1.0.9631 (05 Dec 2006) diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch index 9d56d428e155..004cbd8ae224 100644 --- a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch +++ b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch @@ -1,47 +1,44 @@ -Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h -=================================================================== ---- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv-linux.h -+++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h -@@ -14,10 +14,11 @@ - - #include "nv.h" - --#include <linux/config.h> - #include <linux/version.h> - #include <linux/utsname.h> -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) -+#include <linux/config.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7) - # error This driver does not support 2.4 kernels older than 2.4.7! -Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c -=================================================================== ---- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv.c -+++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c -@@ -288,7 +288,11 @@ int nv_kern_ioctl(struct inode +diff -Naur NVIDIA.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv.c +--- NVIDIA.orig/usr/src/nv/nv.c 2006-10-17 01:31:37.000000000 -0400 ++++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv.c 2006-11-29 21:58:20.000000000 -0500 +@@ -252,7 +252,7 @@ long nv_kern_unlocked_ioctl(struct file *, unsigned int, unsigned long); long nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long); void nv_kern_isr_bh(unsigned long); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); -+#else +-irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); +irqreturn_t nv_kern_isr(int, void *); -+#endif void nv_kern_rc_timer(unsigned long); #if defined(NV_PM_SUPPORT_OLD_STYLE_APM) static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *); -@@ -2595,8 +2599,10 @@ long nv_kern_compat_ioctl( +@@ -2561,8 +2561,7 @@ */ irqreturn_t nv_kern_isr( int irq, - void *arg, - struct pt_regs *regs + void *arg -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -+ , struct pt_regs *regs -+#endif ) { nv_linux_state_t *nvl = (void *) arg; +diff -Naur NVIDIA.orig/usr/src/nv/nv-i2c.c NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-i2c.c +--- NVIDIA.orig/usr/src/nv/nv-i2c.c 2006-10-17 01:31:37.000000000 -0400 ++++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-i2c.c 2006-11-29 21:57:36.000000000 -0500 +@@ -23,8 +23,6 @@ + static struct i2c_algorithm nv_i2c_algo = { + .master_xfer = nv_i2c_algo_xfer, + .smbus_xfer = NULL, +- .slave_send = NULL, +- .slave_recv = NULL, + .algo_control = nv_i2c_algo_control, + .functionality = nv_i2c_algo_functionality, + }; +diff -Naur NVIDIA.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-linux.h +--- NVIDIA.orig/usr/src/nv/nv-linux.h 2006-10-17 01:31:37.000000000 -0400 ++++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-linux.h 2006-11-29 21:57:48.000000000 -0500 +@@ -14,7 +14,6 @@ + + #include "nv.h" + +-#include <linux/config.h> + #include <linux/version.h> + #include <linux/utsname.h> |