From: andmike@us.ibm.com
Fix it for non-mudular builds
drivers/scsi/isp/isp_linux.c | 2 --
drivers/scsi/isp/isp_linux.h | 4 ----
2 files changed, 6 deletions(-)
diff -puN drivers/scsi/isp/isp_linux.c~feral-fix drivers/scsi/isp/isp_linux.c
--- 25/drivers/scsi/isp/isp_linux.c~feral-fix 2003-06-27 14:39:25.000000000 -0700
+++ 25-akpm/drivers/scsi/isp/isp_linux.c 2003-06-27 14:39:25.000000000 -0700
@@ -419,7 +419,6 @@ isplinux_detect(Scsi_Host_Template *tmpt
return (rval);
}
-#ifdef MODULE
/* io_request_lock *not* held here */
int
isplinux_release(struct Scsi_Host *host)
@@ -457,7 +456,6 @@ isplinux_release(struct Scsi_Host *host)
#endif
return (1);
}
-#endif
const char *
isplinux_info(struct Scsi_Host *host)
diff -puN drivers/scsi/isp/isp_linux.h~feral-fix drivers/scsi/isp/isp_linux.h
--- 25/drivers/scsi/isp/isp_linux.h~feral-fix 2003-06-27 14:39:25.000000000 -0700
+++ 25-akpm/drivers/scsi/isp/isp_linux.h 2003-06-27 14:39:25.000000000 -0700
@@ -749,12 +749,8 @@ static INLINE unsigned long _usec_to_jif
int isplinux_proc_info(char *, char **, off_t, int, int, int);
int isplinux_detect(Scsi_Host_Template *);
-#ifdef MODULE
int isplinux_release(struct Scsi_Host *);
#define ISPLINUX_RELEASE isplinux_release
-#else
-#define ISPLINUX_RELEASE NULL
-#endif
const char *isplinux_info(struct Scsi_Host *);
int isplinux_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
_