rendered paste bodydiff -ur usr/src/nv/nv-linux.h usr/src/nv/nv-linux.h.new
--- usr/src/nv/nv-linux.h 2006-10-17 01:31:37.000000000 -0400
+++ usr/src/nv/nv-linux.h.new 2006-11-30 02:38:38.000000000 -0500
@@ -14,7 +14,7 @@
#include "nv.h"
-#include <linux/config.h>
+/* #include <linux/config.h> */
#include <linux/version.h>
#include <linux/utsname.h>
diff -ur usr/src/nv/nv.c usr/src/nv/nv.c.new
--- usr/src/nv/nv.c 2006-10-17 01:31:37.000000000 -0400
+++ usr/src/nv/nv.c.new 2006-11-30 02:45:58.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);
-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;