diff options
| author | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2014-02-10 22:41:28 +0000 |
|---|---|---|
| committer | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2014-02-10 22:41:28 +0000 |
| commit | 3c9ee15104feb68b7719d1877d640d5f9af67c75 (patch) | |
| tree | 1506099fd77a3dcd8f76ec60c792722546cf8f01 /sys/dev/pci | |
| parent | ac165f3c3b3b5ba36058c9e163a0a05dec3b7009 (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/dev/pci')
| -rw-r--r-- | sys/dev/pci/isp_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c index 456d58f17fa..c6e5040f515 100644 --- a/sys/dev/pci/isp_pci.c +++ b/sys/dev/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_pci.c,v 1.57 2011/06/23 22:02:26 oga Exp $ */ +/* $OpenBSD: isp_pci.c,v 1.58 2014/02/10 22:41:27 jmatthew Exp $ */ /* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.148 2007/06/26 23:08:57 mjacob Exp $*/ /*- * Copyright (c) 1997-2006 by Matthew Jacob @@ -75,22 +75,22 @@ #endif #if defined(ISP_FIRMWARE_2100) +extern const u_int16_t isp_2100_risc_code[]; #define ISP_2100_RISC_CODE (u_int16_t *) isp_2100_risc_code -#include <dev/microcode/isp/asm_2100.h> #else #define ISP_2100_RISC_CODE NULL #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 #if defined(ISP_FIRMWARE_2300) +extern const u_int16_t isp_2300_risc_code[]; #define ISP_2300_RISC_CODE (u_int16_t *) isp_2300_risc_code -#include <dev/microcode/isp/asm_2300.h> #else #define ISP_2300_RISC_CODE NULL #endif |