summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-10 22:41:28 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-10 22:41:28 +0000
commit3c9ee15104feb68b7719d1877d640d5f9af67c75 (patch)
tree1506099fd77a3dcd8f76ec60c792722546cf8f01 /sys/arch
parentac165f3c3b3b5ba36058c9e163a0a05dec3b7009 (diff)
Build isp2xxx firmware into separate object files so we only include
one copy when both isp(4) and qla(4) are enabled. This is a temporary measure until qla(4) takes over completely. looked at by miod@ and kettenis@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc/dev/isp_sbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index 49c6f3b5706..771d664996a 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.31 2011/04/22 23:29:18 deraadt Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.32 2014/02/10 22:41:27 jmatthew Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -56,8 +56,8 @@
#endif
#if defined(ISP_FIRMWARE_2200)
+extern const u_int16_t isp_2200_risc_code[];
#define ISP_2200_RISC_CODE (u_int16_t *) isp_2200_risc_code
-#include <dev/microcode/isp/asm_2200.h>
#else
#define ISP_2200_RISC_CODE NULL
#endif