# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1064  -> 1.1066 
#	drivers/scsi/isp/isp_linux.c	1.1     -> 1.2    
#	drivers/scsi/isp/isp_linux.h	1.1     -> 1.2    
#	drivers/scsi/Makefile	1.41    -> 1.42   
#	drivers/scsi/Kconfig	1.20    -> 1.21   
#	               (new)	        -> 1.1     drivers/scsi/isp/Makefile
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/15	jejb@raven.il.steeleye.com	1.1065
# Plumb the Feral ISP driver into the SCSI Builds
# --------------------------------------------
# 03/05/15	jejb@raven.il.steeleye.com	1.1066
# Update feral ISP driver to compile without warnings
# 
# add #include <linux/vmalloc.h> and convert to irqreturn_t
# --------------------------------------------
#
diff -Nru a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
--- a/drivers/scsi/Kconfig	Thu May 15 12:12:52 2003
+++ b/drivers/scsi/Kconfig	Thu May 15 12:12:52 2003
@@ -1739,6 +1739,15 @@
 
 #      bool 'Cyberstorm Mk III SCSI support (EXPERIMENTAL)' CONFIG_CYBERSTORMIII_SCSI
 #      bool 'GVP Turbo 040/060 SCSI support (EXPERIMENTAL)' CONFIG_GVP_TURBO_SCSI
+
+config SCSI_FERAL_ISP
+	tristate "Feral ISP driver for 10x0/12x0/2x00"
+	depends on SCSI
+	help
+	  Feral Driver for the following qlogic ISP chips
+	  1020/1040/1080/1280/12160/2100/2200/2300
+	  If this doesn't work, there are other drivers for these chips
+	  below.
 endmenu
 
 source "drivers/scsi/pcmcia/Kconfig"
diff -Nru a/drivers/scsi/Makefile b/drivers/scsi/Makefile
--- a/drivers/scsi/Makefile	Thu May 15 12:12:52 2003
+++ b/drivers/scsi/Makefile	Thu May 15 12:12:52 2003
@@ -69,6 +69,7 @@
 obj-$(CONFIG_SCSI_NCR53C406A)	+= NCR53c406a.o
 obj-$(CONFIG_SCSI_NCR_D700)	+= NCR_D700.o 53c700.o
 obj-$(CONFIG_SCSI_SYM53C416)	+= sym53c416.o
+obj-$(CONFIG_SCSI_FERAL_ISP)	+= isp/
 obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicfas.o
 obj-$(CONFIG_SCSI_QLOGIC_ISP)	+= qlogicisp.o 
 obj-$(CONFIG_SCSI_QLOGIC_FC)	+= qlogicfc.o 
diff -Nru a/drivers/scsi/isp/Makefile b/drivers/scsi/isp/Makefile
--- /dev/null	Wed Dec 31 16:00:00 1969
+++ b/drivers/scsi/isp/Makefile	Thu May 15 12:12:52 2003
@@ -0,0 +1,5 @@
+obj-y		+= isp_mod.o
+
+EXTRA_CFLAGS	+= -Idrivers/scsi
+
+isp_mod-y	+= isp_pci.o isp_linux.o isp.o isp_cb_ops.o isp_target.o
diff -Nru a/drivers/scsi/isp/isp_linux.c b/drivers/scsi/isp/isp_linux.c
--- a/drivers/scsi/isp/isp_linux.c	Thu May 15 12:12:51 2003
+++ b/drivers/scsi/isp/isp_linux.c	Thu May 15 12:12:52 2003
@@ -2241,7 +2241,7 @@
     ISP_IUNLK_SOFTC(isp);
 }
 
-void
+irqreturn_t
 isplinux_intr(int irq, void *arg, struct pt_regs *pt)
 {
     struct ispsoftc *isp = arg;
@@ -2253,7 +2253,7 @@
     if (ISP_READ_ISR(isp, &isr, &sema, &mbox) == 0) {
 	isp->isp_intbogus++;
 	ISP_IUNLK_SOFTC(isp);
-	return;
+	return IRQ_NONE;
     }
     isp_intr(isp, isr, sema, mbox);
     isplinux_runwaitq(isp);
@@ -2293,6 +2293,7 @@
 	}
 	ISP_UNLK_SCSI_DONE(isp);
     }
+    return IRQ_HANDLED;
 }
 
 static INLINE int
diff -Nru a/drivers/scsi/isp/isp_linux.h b/drivers/scsi/isp/isp_linux.h
--- a/drivers/scsi/isp/isp_linux.h	Thu May 15 12:12:52 2003
+++ b/drivers/scsi/isp/isp_linux.h	Thu May 15 12:12:52 2003
@@ -40,6 +40,8 @@
 #ifndef _ISP_LINUX_H
 #define _ISP_LINUX_H
 
+#include <linux/vmalloc.h>
+
 #ifndef	ISP_MODULE
 #define	__NO_VERSION__
 #endif
@@ -732,7 +734,7 @@
  */
 void isplinux_timer(unsigned long);
 void isplinux_mbtimer(unsigned long);
-void isplinux_intr(int, void *, struct pt_regs *);
+irqreturn_t isplinux_intr(int, void *, struct pt_regs *);
 void isplinux_common_init(struct ispsoftc *);
 #ifdef	CONFIG_PROC_FS
 void isplinux_init_proc(struct ispsoftc *);