svn commit: r292112 - head/sys/arm64/conf

Andrew Turner andrew at FreeBSD.org
Fri Dec 11 15:25:48 UTC 2015


Author: andrew
Date: Fri Dec 11 15:25:47 2015
New Revision: 292112
URL: https://svnweb.freebsd.org/changeset/base/292112

Log:
  Sort the list of NICs after the mii options. While here add the msk driver
  as it has now been tested.
  
  Sponsored by:	SoftIron Inc

Modified:
  head/sys/arm64/conf/GENERIC

Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC	Fri Dec 11 15:24:29 2015	(r292111)
+++ head/sys/arm64/conf/GENERIC	Fri Dec 11 15:25:47 2015	(r292112)
@@ -99,11 +99,12 @@ device		pci
 options 	PCI_IOV		# PCI SR-IOV support
 
 # Ethernet NICs
-device		vnic		# Cavium ThunderX NIC
-device		em		# Intel PRO/1000 Gigabit Ethernet Family
-device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
 device		mii
 device		miibus		# MII bus support
+device		em		# Intel PRO/1000 Gigabit Ethernet Family
+device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
+device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
+device		vnic		# Cavium ThunderX NIC
 
 # Block devices
 device		ahci


More information about the svn-src-all mailing list