From owner-svn-src-head@FreeBSD.ORG  Wed May 25 10:04:13 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA562106566B;
	Wed, 25 May 2011 10:04:13 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB7148FC0C;
	Wed, 25 May 2011 10:04:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4PA4D16009289;
	Wed, 25 May 2011 10:04:13 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4PA4D4u009286;
	Wed, 25 May 2011 10:04:13 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201105251004.p4PA4D4u009286@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 25 May 2011 10:04:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222282 - in head/sys: amd64/conf i386/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 May 2011 10:04:14 -0000

Author: kevlo
Date: Wed May 25 10:04:13 2011
New Revision: 222282
URL: http://svn.freebsd.org/changeset/base/222282

Log:
  Bring back r222275. runfw(4) will statically link in rt2870.fw.uu
  to the kernel, though I have MODULES_OVERRIDE="" in GENERIC.
  
  Spotted by:	thompsa

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/i386/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Wed May 25 09:45:13 2011	(r222281)
+++ head/sys/amd64/conf/GENERIC	Wed May 25 10:04:13 2011	(r222282)
@@ -324,7 +324,6 @@ device		udav		# Davicom DM9601E USB
 # USB Wireless
 device		rum		# Ralink Technology RT2501USB wireless NICs
 device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
-device		runfw		# Ralink Technology RT2700/RT2800/RT3000 NICs firmware
 device		uath		# Atheros AR5523 wireless NICs
 device		upgt		# Conexant/Intersil PrismGT wireless NICs.
 device		ural		# Ralink Technology RT2500USB wireless NICs

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Wed May 25 09:45:13 2011	(r222281)
+++ head/sys/i386/conf/GENERIC	Wed May 25 10:04:13 2011	(r222282)
@@ -337,7 +337,6 @@ device		udav		# Davicom DM9601E USB
 # USB Wireless
 device		rum		# Ralink Technology RT2501USB wireless NICs
 device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
-device		runfw		# Ralink Technology RT2700/RT2800/RT3000 NICs firmware
 device		uath		# Atheros AR5523 wireless NICs
 device		upgt		# Conexant/Intersil PrismGT wireless NICs.
 device		ural		# Ralink Technology RT2500USB wireless NICs