From owner-svn-src-head@FreeBSD.ORG  Sat Dec 27 17:10:36 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B634C5F7;
 Sat, 27 Dec 2014 17:10:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 A2329FE9;
 Sat, 27 Dec 2014 17:10:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBRHAaQY092734;
 Sat, 27 Dec 2014 17:10:36 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBRHAaqH092733;
 Sat, 27 Dec 2014 17:10:36 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201412271710.sBRHAaqH092733@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 27 Dec 2014 17:10:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276308 - in head/sys: conf contrib/dev/iwn
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.18-1
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Dec 2014 17:10:36 -0000

Author: marius
Date: Sat Dec 27 17:10:35 2014
New Revision: 276308
URL: https://svnweb.freebsd.org/changeset/base/276308

Log:
  Use the same 6000 series g2{a,b} firmware versions when embedding these
  images into the kernel as currently included into iwn6000g2{a,b}fw.ko
  and delete the old files, missed in r254199 and r259135 respectively.
  
  MFC after:	3 days

Deleted:
  head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu
  head/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu
Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sat Dec 27 17:10:14 2014	(r276307)
+++ head/sys/conf/files	Sat Dec 27 17:10:35 2014	(r276308)
@@ -1731,7 +1731,7 @@ iwn6000g2afw.fwo		optional iwn6000g2afw 
 	no-implicit-rule						\
 	clean		"iwn6000g2afw.fwo"
 iwn6000g2a.fw			optional iwn6000g2afw | iwnfw		\
-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu" \
+	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000g2a.fw"
@@ -1745,7 +1745,7 @@ iwn6000g2bfw.fwo		optional iwn6000g2bfw 
 	no-implicit-rule						\
 	clean		"iwn6000g2bfw.fwo"
 iwn6000g2b.fw			optional iwn6000g2bfw | iwnfw		\
-	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu" \
+	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000g2b.fw"