diff options
| author | davidch <davidch@FreeBSD.org> | 2013-09-20 20:18:49 +0000 |
|---|---|---|
| committer | davidch <davidch@FreeBSD.org> | 2013-09-20 20:18:49 +0000 |
| commit | e226cdd9b86260d8a329201e38a0ea97b4cd4c39 (patch) | |
| tree | f12f72cd242d820f494bbb63bc49b513084ced43 /sys/amd64/conf/GENERIC | |
| parent | 0e1e730ce790f1bb4ce55cde187809b020a3313b (diff) | |
| download | FreeBSD-src-e226cdd9b86260d8a329201e38a0ea97b4cd4c39.zip FreeBSD-src-e226cdd9b86260d8a329201e38a0ea97b4cd4c39.tar.gz | |
Substantial rewrite of bxe(4) to add support for the BCM57712 and
BCM578XX controllers.
Approved by: re
MFC after: 4 weeks
Diffstat (limited to 'sys/amd64/conf/GENERIC')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index f11d5f2..4de94ce 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -204,7 +204,7 @@ device ppi # Parallel port interface device device puc # Multi I/O cards and multi-channel UARTs # PCI Ethernet NICs. -device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet +device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family @@ -341,8 +341,5 @@ device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device -# HyperV drivers -device hyperv # HyperV drivers - # VMware support device vmx # VMware VMXNET3 Ethernet |
