Package: nvidia-kernel-source Version: 1.0.8776-3 Severity: grave Tags: patch
8876 in unstable does not compile with 2.6.19 due to the interrupt interface change and an struct change in i2c. The fix is trivial: diff -ru nvidia-kernel/nv/nv.c nvidia-kernel-patched/nv/nv.c --- nvidia-kernel/nv/nv.c 2006-12-04 03:04:54.000000000 +0100 +++ nvidia-kernel-patched/nv/nv.c 2006-12-07 11:00:59.042282766 +0100 @@ -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); -irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); +irqreturn_t nv_kern_isr(int, void *); 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 *); @@ -2561,8 +2561,7 @@ */ irqreturn_t nv_kern_isr( int irq, - void *arg, - struct pt_regs *regs + void *arg ) { nv_linux_state_t *nvl = (void *) arg; diff -ru nvidia-kernel/nv/nv-i2c.c nvidia-kernel-patched/nv/nv-i2c.c --- nvidia-kernel/nv/nv-i2c.c 2006-12-04 03:04:54.000000000 +0100 +++ nvidia-kernel-patched/nv/nv-i2c.c 2006-12-07 11:03:38.143216305 +0100 @@ -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 -ru nvidia-kernel/nv/nv-linux.h nvidia-kernel-patched/nv/nv-linux.h --- nvidia-kernel/nv/nv-linux.h 2006-12-04 03:04:54.000000000 +0100 +++ nvidia-kernel-patched/nv/nv-linux.h 2006-12-07 11:01:54.669406211 +0100 @@ -14,7 +14,6 @@ #include "nv.h" -#include <linux/config.h> #include <linux/version.h> #include <linux/utsname.h> -- System Information: Debian Release: 4.0 APT prefers unstable APT policy: (990, 'unstable'), (700, 'experimental'), (500, 'stable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.19 Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Versions of packages nvidia-kernel-source depends on: ii debhelper 5.0.42 helper programs for debian/rules ii dpatch 2.0.21 patch maintenance system for Debia ii make 3.81-3 The GNU version of the "make" util ii sed 4.1.5-1 The GNU sed stream editor Versions of packages nvidia-kernel-source recommends: ii devscripts 2.9.26 Scripts to make the life of a Debi ii kernel-package 10.065 A utility for building Linux kerne ii nvidia-glx 1.0.8776-3 NVIDIA binary XFree86 4.x driver -- no debconf information
diff -ru nvidia-kernel/nv/nv.c nvidia-kernel-patched/nv/nv.c --- nvidia-kernel/nv/nv.c 2006-12-04 03:04:54.000000000 +0100 +++ nvidia-kernel-patched/nv/nv.c 2006-12-07 11:00:59.042282766 +0100 @@ -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); -irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); +irqreturn_t nv_kern_isr(int, void *); 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 *); @@ -2561,8 +2561,7 @@ */ irqreturn_t nv_kern_isr( int irq, - void *arg, - struct pt_regs *regs + void *arg ) { nv_linux_state_t *nvl = (void *) arg; diff -ru nvidia-kernel/nv/nv-i2c.c nvidia-kernel-patched/nv/nv-i2c.c --- nvidia-kernel/nv/nv-i2c.c 2006-12-04 03:04:54.000000000 +0100 +++ nvidia-kernel-patched/nv/nv-i2c.c 2006-12-07 11:03:38.143216305 +0100 @@ -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 -ru nvidia-kernel/nv/nv-linux.h nvidia-kernel-patched/nv/nv-linux.h --- nvidia-kernel/nv/nv-linux.h 2006-12-04 03:04:54.000000000 +0100 +++ nvidia-kernel-patched/nv/nv-linux.h 2006-12-07 11:01:54.669406211 +0100 @@ -14,7 +14,6 @@ #include "nv.h" -#include <linux/config.h> #include <linux/version.h> #include <linux/utsname.h>