From owner-svn-src-head@freebsd.org  Fri Dec 11 15:25:48 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C0789D7677;
 Fri, 11 Dec 2015 15:25:48 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3C1541A9F;
 Fri, 11 Dec 2015 15:25:48 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBBFPlb8004057;
 Fri, 11 Dec 2015 15:25:47 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBBFPl3V004056;
 Fri, 11 Dec 2015 15:25:47 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201512111525.tBBFPl3V004056@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 11 Dec 2015 15:25:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292112 - head/sys/arm64/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Dec 2015 15:25:48 -0000

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