patch-pre2.0.13 linux/drivers/scsi/qlogicisp.c

Next file: linux/drivers/scsi/scsi.h
Previous file: linux/drivers/scsi/in2000.readme
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.12/linux/drivers/scsi/qlogicisp.c linux/drivers/scsi/qlogicisp.c
@@ -48,10 +48,10 @@
 #include <linux/types.h>
 #include <linux/bios32.h>
 #include <linux/pci.h>
-#include <unistd.h>
+#include <linux/delay.h>
+#include <linux/unistd.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/delay.h>
 
 #include "sd.h"
 #include "hosts.h"
@@ -71,10 +71,6 @@
 
 #define USE_NVRAM_DEFAULTS	0
 
-/*  Set this macro to 1 if you want to create a scsi loadable module. */
-
-#define MODULE			0
-
 /*  Macros used for debugging */
 
 #define DEBUG_ISP1020		0
@@ -1681,8 +1677,8 @@
     return (sts->scsi_status & STATUS_MASK) | (host_status << 16);
 }
 
-#if MODULE
-Scsi_Host_Template driver_template = ISP1020;
+#ifdef MODULE
+Scsi_Host_Template driver_template = QLOGICISP;
 
 #include "scsi_module.c"
 #endif /* MODULE */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this