diff --git a/sys/dev/ic/isp_inline.h b/sys/dev/ic/isp_inline.h
index 6570ff6a0b15..9c2d9b8468b8 100644
--- a/sys/dev/ic/isp_inline.h
+++ b/sys/dev/ic/isp_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_inline.h,v 1.29 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: isp_inline.h,v 1.30 2007/01/13 19:41:12 cube Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -165,12 +165,13 @@ isp_getrqentry(struct ispsoftc *isp, u_int16_t *iptrp,
 	return (0);
 }
 
-static INLINE void isp_print_qentry (struct ispsoftc *, char *, int, void *);
+static INLINE void isp_print_qentry (struct ispsoftc *, const char *, int,
+    void *);
 
 
 #define	TBA	(4 * (((QENTRY_LEN >> 2) * 3) + 1) + 1)
 static INLINE void
-isp_print_qentry(struct ispsoftc *isp, char *msg, int idx, void *arg)
+isp_print_qentry(struct ispsoftc *isp, const char *msg, int idx, void *arg)
 {
 	char tbuf[TBA];
 	int amt, i, j;
diff --git a/sys/dev/ic/isp_netbsd.c b/sys/dev/ic/isp_netbsd.c
index dabf5bb5b0a1..a2d5d7c4a2f3 100644
--- a/sys/dev/ic/isp_netbsd.c
+++ b/sys/dev/ic/isp_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.71 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.72 2007/01/13 19:41:12 cube Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.71 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.72 2007/01/13 19:41:12 cube Exp $");
 
 #include <dev/ic/isp_netbsd.h>
 #include <sys/scsiio.h>
@@ -1122,7 +1122,7 @@ isp_async(struct ispsoftc *isp, ispasync_t cmd, void *arg)
 			isp_fw_dump(isp);
 		}
 		isp_reinit(isp);
-		isp_async(isp, ISPASYNC_FW_RESTART, NULL);
+		isp_async(isp, ISPASYNC_FW_RESTARTED, NULL);
 #endif
 		break;
 	}
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c
index 1cb9daf8369c..48d3e18a7530 100644
--- a/sys/dev/ic/isp_target.c
+++ b/sys/dev/ic/isp_target.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_target.c,v 1.28 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: isp_target.c,v 1.29 2007/01/13 19:41:12 cube Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.28 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.29 2007/01/13 19:41:12 cube Exp $");
 
 #ifdef	__NetBSD__
 #include <dev/ic/isp_netbsd.h>
@@ -910,7 +910,7 @@ isp_handle_ctio(struct ispsoftc *isp, ct_entry_t *ct)
 {
 	void *xs;
 	int pl = ISP_LOGTDEBUG2;
-	char *fmsg = NULL;
+	const char *fmsg = NULL;
 
 	if (ct->ct_syshandle) {
 		xs = isp_find_xs(isp, ct->ct_syshandle);
@@ -1070,7 +1070,7 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct)
 {
 	XS_T *xs;
 	int pl = ISP_LOGTDEBUG2;
-	char *fmsg = NULL;
+	const char *fmsg = NULL;
 
 	if (ct->ct_syshandle) {
 		xs = isp_find_xs(isp, ct->ct_syshandle);
diff --git a/sys/dev/ic/isp_target.h b/sys/dev/ic/isp_target.h
index d035e96818d8..2fc4867b6ee7 100644
--- a/sys/dev/ic/isp_target.h
+++ b/sys/dev/ic/isp_target.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_target.h,v 1.22 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: isp_target.h,v 1.23 2007/01/13 19:41:12 cube Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -529,12 +529,14 @@ typedef struct {
 #define	ISP_TDQE(isp, msg, idx, arg)	\
     if (isp->isp_dblev & ISP_LOGTDEBUG2) isp_print_qentry(isp, msg, idx, arg)
 
-#ifdef	ISP_TARGET_FUNCTIONS
+#ifdef	ISP_TARGET_MODE
 /*
  * The functions below are for the publicly available
  * target mode functions that are internal to the Qlogic driver.
  */
 
+struct ispsoftc;
+
 /*
  * This function handles new response queue entry appropriate for target mode.
  */