aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/isp/isp_freebsd.h
diff options
context:
space:
mode:
authorMatt Jacob <mjacob@FreeBSD.org>2011-02-28 15:58:30 +0000
committerMatt Jacob <mjacob@FreeBSD.org>2011-02-28 15:58:30 +0000
commit898899d9ddbd15925a9d3c6b1da0d426dbc6351b (patch)
tree293c009112d37696bbf2bd622af88ca94e5a1d05 /sys/dev/isp/isp_freebsd.h
parent2f203e818f898ba9cbee9d497ded5fb4d454c197 (diff)
downloadsrc-898899d9ddbd15925a9d3c6b1da0d426dbc6351b.tar.gz
src-898899d9ddbd15925a9d3c6b1da0d426dbc6351b.zip
Sync FreeBSD ISP with mercurial tree. Minor changes having to do with
a macro for minima.
Notes
Notes: svn path=/head/; revision=219098
Diffstat (limited to 'sys/dev/isp/isp_freebsd.h')
-rw-r--r--sys/dev/isp/isp_freebsd.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 5d2153584032..c47f12b93bf7 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -325,6 +325,8 @@ struct isposinfo {
#define ISP_DELAY DELAY
#define ISP_SLEEP(isp, x) DELAY(x)
+#define ISP_MIN imin
+
#ifndef DIAGNOSTIC
#define ISP_INLINE __inline
#else