summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>2018-04-04 18:06:52 +0000
committerken <ken@FreeBSD.org>2018-04-04 18:06:52 +0000
commitf129c9c1c0c99930fb43397e9ffb3a815f6075d3 (patch)
tree797cb3f5f720fd9a29fb824320a178b1025a4a6a /sys/amd64
parent62fb9221966d3fc6e5d980e59ca673fbef5dad42 (diff)
downloadFreeBSD-src-f129c9c1c0c99930fb43397e9ffb3a815f6075d3.zip
FreeBSD-src-f129c9c1c0c99930fb43397e9ffb3a815f6075d3.tar.gz
MFC r331766, r331768:
------------------------------------------------------------------------ r331766 | ken | 2018-03-30 09:28:25 -0600 (Fri, 30 Mar 2018) | 25 lines Bring in the Broadcom/Emulex Fibre Channel driver, ocs_fc(4). The ocs_fc(4) driver supports the following hardware: Emulex 16/8G FC GEN 5 HBAS LPe15004 FC Host Bus Adapters LPe160XX FC Host Bus Adapters Emulex 32/16G FC GEN 6 HBAS LPe3100X FC Host Bus Adapters LPe3200X FC Host Bus Adapters The driver supports target and initiator mode, and also supports FC-Tape. Note that the driver only currently works on little endian platforms. It is only included in the module build for amd64 and i386, and in GENERIC on amd64 only. Submitted by: Ram Kishore Vegesna <ram.vegesna@broadcom.com> Reviewed by: mav Relnotes: yes Sponsored by: Broadcom Differential Revision: https://reviews.freebsd.org/D11423 ------------------------------------------------------------------------ r331768 | cem | 2018-03-30 10:44:54 -0600 (Fri, 30 Mar 2018) | 9 lines ocs_fc(4): Fix GCC build (-Wredundant-decls) These objects are defined earlier in the same file; an extern declaration after definition is redundant. Broken in r331766 (introduction of ocs_fc(4)). Sponsored by: Dell EMC Isilon ------------------------------------------------------------------------ Differential Revision: https://reviews.freebsd.org/D11423 Relnotes: yes
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index b4eb43d..195b66d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -130,6 +130,7 @@ device adw # Advansys wide SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
device isci # Intel C600 SAS controller
+device ocs_fc # Emulex FC adapters
# ATA/SCSI peripherals
device scbus # SCSI bus (required for ATA/SCSI)
OpenPOWER on IntegriCloud