From owner-freebsd-bugs@FreeBSD.ORG  Mon Jul 19 15:10:05 2010
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71F3F106564A
	for <freebsd-bugs@hub.freebsd.org>;
	Mon, 19 Jul 2010 15:10:05 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F48A8FC1B
	for <freebsd-bugs@hub.freebsd.org>;
	Mon, 19 Jul 2010 15:10:05 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6JFA5aW047268
	for <freebsd-bugs@freefall.freebsd.org>; Mon, 19 Jul 2010 15:10:05 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6JFA5K1047267;
	Mon, 19 Jul 2010 15:10:05 GMT (envelope-from gnats)
Resent-Date: Mon, 19 Jul 2010 15:10:05 GMT
Resent-Message-Id: <201007191510.o6JFA5K1047267@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Joe Talbott <josepht@dragonflybsd.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 072071065788
	for <freebsd-gnats-submit@FreeBSD.org>;
	Mon, 19 Jul 2010 15:05:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id EA6D38FC2C
	for <freebsd-gnats-submit@FreeBSD.org>;
	Mon, 19 Jul 2010 15:05:58 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6JF5wRQ026304
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Jul 2010 15:05:58 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o6JF5wnb026303;
	Mon, 19 Jul 2010 15:05:58 GMT (envelope-from nobody)
Message-Id: <201007191505.o6JF5wnb026303@www.freebsd.org>
Date: Mon, 19 Jul 2010 15:05:58 GMT
From: Joe Talbott <josepht@dragonflybsd.org>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: conf/148758: wpi license not required when building wpifw into the
	kernel.
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jul 2010 15:10:05 -0000


>Number:         148758
>Category:       conf
>Synopsis:       wpi license not required when building wpifw into the kernel.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 19 15:10:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Joe Talbott
>Release:        
>Organization:
DragonFly BSD
>Environment:
>Description:
Since there is no longer a need for a license acknowledgment when building wpifw as a module, remove the license requirement when building into the kernel as well.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/sys/conf/files b/sys/conf/files
index 0f0acf0..54d218b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1859,7 +1859,7 @@ dev/wi/if_wi_pccard.c		optional wi pccard
 dev/wi/if_wi_pci.c		optional wi pci
 dev/wl/if_wl.c			optional wl isa
 wpifw.c			optional wpifw					\
-	compile-with	"${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -mwpi -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"wpifw.c"
 wpifw.fwo			optional wpifw				\


>Release-Note:
>Audit-Trail:
>Unformatted: