head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.2.1.4.2
	RELENG_9_1:1.2.2.1.0.4
	RELENG_9_1_BP:1.2.2.1
	RELENG_8_3_0_RELEASE:1.1.2.3.2.1
	RELENG_8_3:1.1.2.3.0.2
	RELENG_8_3_BP:1.1.2.3
	RELENG_9_0_0_RELEASE:1.2.2.1.2.1
	RELENG_9_0:1.2.2.1.0.2
	RELENG_9_0_BP:1.2.2.1
	RELENG_9:1.2.0.2
	RELENG_9_BP:1.2
	RELENG_8_2_0_RELEASE:1.1.2.2.2.1
	RELENG_8_2:1.1.2.2.0.2
	RELENG_8_2_BP:1.1.2.2
	RELENG_8:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.52.56;	author svnexp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2011.04.20.17.32.20;	author bschmidt;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2010.07.15.11.26.07;	author bschmidt;	state Exp;
branches
	1.1.2.1;
next	;

1.3.2.1
date	2012.11.17.01.52.56;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.05.21;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.11.37.17;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.2.1.2.2;

1.2.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.1.4.2;

1.2.2.1.4.2
date	2012.11.17.08.48.05;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2010.07.31.10.18.15;	author bschmidt;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2010.07.31.10.18.15;	author bschmidt;	state Exp;
branches
	1.1.2.2.2.1;
next	1.1.2.3;

1.1.2.3
date	2011.06.18.12.27.49;	author bschmidt;	state Exp;
branches
	1.1.2.3.2.1;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	;

1.1.2.2.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.1.2.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.2.3.2.2;

1.1.2.3.2.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/iwnfw/iwn6050/Makefile 220892 2011-04-20 17:32:20Z bschmidt $

KMOD=	iwn6050fw
IMG=	iwlwifi-6050-41.28.5.1

.include <bsd.kmod.mk>
@


1.3.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:21 +0000
@
text
@d1 6
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 6
# $FreeBSD: releng/8.4/sys/modules/iwnfw/iwn6050/Makefile 223255 2011-06-18 12:27:49Z bschmidt $

KMOD=	iwn6050fw
IMG=	iwlwifi-6050-41.28.5.1

.include <bsd.kmod.mk>
@


1.2
log
@SVN rev 220892 on 2011-04-20 17:32:20Z by bschmidt

Update iwn(4) firmware blobs:
- bump iwn1000fw to 39.31.5.1
- bump iwn5000fw to 8.83.5.1
- bump iwn6050fw to 41.28.5.1
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.2.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/iwnfw/iwn6050/Makefile 220892 2011-04-20 17:32:20Z bschmidt $
@


1.2.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/iwnfw/iwn6050/Makefile 220892 2011-04-20 17:32:20Z bschmidt $
@


1.2.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/iwnfw/iwn6050/Makefile 220892 2011-04-20 17:32:20Z bschmidt $
@


1.1
log
@SVN rev 210113 on 2010-07-15 11:26:07Z by bschmidt

- Update 6000 firmware to 9.221.4.1
- Add 6050 firmware

MFC after:	2 weeks
@
text
@d4 1
a4 1
IMG=	iwlwifi-6050-9.201.4.1
@


1.1.2.1
log
@file Makefile was added on branch RELENG_8 on 2010-07-31 10:21:22 +0000
@
text
@d1 6
@


1.1.2.2
log
@SVN rev 210673 on 2010-07-31 10:18:15Z by bschmidt

MFC r210113:
- Update 6000 firmware to 9.221.4.1
- Add 6050 firmware
@
text
@a0 6
# $FreeBSD$

KMOD=	iwn6050fw
IMG=	iwlwifi-6050-9.201.4.1

.include <bsd.kmod.mk>
@


1.1.2.3
log
@SVN rev 223255 on 2011-06-18 12:27:49Z by bschmidt

MFC r220892:
Update iwn(4) firmware blobs:
- bump iwn1000fw to 39.31.5.1
- bump iwn5000fw to 8.83.5.1
- bump iwn6050fw to 41.28.5.1
@
text
@d4 1
a4 1
IMG=	iwlwifi-6050-41.28.5.1
@


1.1.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/iwnfw/iwn6050/Makefile 223255 2011-06-18 12:27:49Z bschmidt $
@


1.1.2.3.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/iwnfw/iwn6050/Makefile 223255 2011-06-18 12:27:49Z bschmidt $
@


1.1.2.2.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


