From owner-svn-src-stable-12@freebsd.org  Wed Feb 26 13:23:55 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 068AD258408;
 Wed, 26 Feb 2020 13:23:54 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48SGj62mfwz3Lpx;
 Wed, 26 Feb 2020 13:23:54 +0000 (UTC)
 (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A372927FCD;
 Wed, 26 Feb 2020 13:23:53 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01QDNr4P051532;
 Wed, 26 Feb 2020 13:23:53 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01QDNrRA051531;
 Wed, 26 Feb 2020 13:23:53 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202002261323.01QDNrRA051531@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 26 Feb 2020 13:23:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r358331 - stable/12/sys/mips/conf
X-SVN-Group: stable-12
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: stable/12/sys/mips/conf
X-SVN-Commit-Revision: 358331
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2020 13:23:55 -0000

Author: kevans
Date: Wed Feb 26 13:23:52 2020
New Revision: 358331
URL: https://svnweb.freebsd.org/changeset/base/358331

Log:
  MFC r347515: Catch up with r347241 (if_tuntap rename).

Modified:
  stable/12/sys/mips/conf/std.AR_MIPS_BASE
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/mips/conf/std.AR_MIPS_BASE
==============================================================================
--- stable/12/sys/mips/conf/std.AR_MIPS_BASE	Wed Feb 26 13:22:23 2020	(r358330)
+++ stable/12/sys/mips/conf/std.AR_MIPS_BASE	Wed Feb 26 13:23:52 2020	(r358331)
@@ -21,8 +21,8 @@ options 	SCSI_NO_OP_STRINGS
 # .. And no sysctl strings
 options 	NO_SYSCTL_DESCR
 
-makeoptions 	MODULES_OVERRIDE+="gpio ar71xx if_gif if_vlan if_gre if_tap"
-makeoptions 	MODULES_OVERRIDE+="if_tun if_bridge bridgestp usb"
+makeoptions 	MODULES_OVERRIDE+="gpio ar71xx if_gif if_vlan if_gre if_tuntap"
+makeoptions 	MODULES_OVERRIDE+="if_bridge bridgestp usb"
 makeoptions 	MODULES_OVERRIDE+="alq"
 
 # Random - required during early boot!