aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/isp/isp_freebsd.h
diff options
context:
space:
mode:
authorMatt Jacob <mjacob@FreeBSD.org>1998-09-18 00:46:42 +0000
committerMatt Jacob <mjacob@FreeBSD.org>1998-09-18 00:46:42 +0000
commit3dd37e4387dd4551965cea9044c4f2271fff9d9f (patch)
treec4ee1ce251a311ad358940fa1514db470cd50027 /sys/dev/isp/isp_freebsd.h
parent6d10d056f3b25f5baf0103ff8f13f4ab08683a8e (diff)
Notes
Diffstat (limited to 'sys/dev/isp/isp_freebsd.h')
-rw-r--r--sys/dev/isp/isp_freebsd.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 98c93c13a7bf..6677b7c29bf9 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -35,14 +35,18 @@
#define _ISP_FREEBSD_H
#define ISP_PLATFORM_VERSION_MAJOR 0
-#define ISP_PLATFORM_VERSION_MINOR 96
+#define ISP_PLATFORM_VERSION_MINOR 97
-#include "opt_scsi.h"
-#ifdef SCSI_CAM
+#include <sys/param.h>
+
+#ifndef __FreeBSD_version
+#define __FreeBSD_version 226000
+#endif
+
+#if __FreeBSD_version >= 300004
#include <dev/isp/isp_freebsd_cam.h>
#else
-#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/buf.h>
@@ -55,15 +59,6 @@
#include <vm/pmap.h>
#include <sys/kernel.h>
-/*
- * Now that __FreeBSD_version is in sys/param.h, we can
- * automatically handle pre-3.0 cases.
- */
-
-#ifndef __FreeBSD_version
-#define __FreeBSD_version 226000
-#endif
-
#define ISP_SCSI_XFER_T struct scsi_xfer
struct isposinfo {
char name[8];
@@ -167,5 +162,5 @@ extern void isp_attach __P((struct ispsoftc *));
#define PVS "Qlogic ISP Driver, FreeBSD Non-Cam"
-#endif /* !SCSI_CAM */
+#endif /* __FreeBSD_version >= 300004 */
#endif /* _ISP_FREEBSD_H */