Index: src/share/man/man4/Makefile
===================================================================
RCS file: /home/ncvs/src/share/man/man4/Makefile,v
retrieving revision 1.393.2.11
diff -u -r1.393.2.11 Makefile
--- src/share/man/man4/Makefile	9 May 2008 02:23:11 -0000	1.393.2.11
+++ src/share/man/man4/Makefile	22 Sep 2008 13:00:04 -0000
@@ -136,6 +136,7 @@
 	isp.4 \
 	ispfw.4 \
 	iwi.4 \
+	iwn.4 \
 	ixgb.4 \
 	joy.4 \
 	kbdmux.4 \
Index: src/sys/amd64/conf/NOTES
===================================================================
RCS file: /home/ncvs/src/sys/amd64/conf/NOTES,v
retrieving revision 1.69.2.4
diff -u -r1.69.2.4 NOTES
--- src/sys/amd64/conf/NOTES	3 Feb 2008 07:28:37 -0000	1.69.2.4
+++ src/sys/amd64/conf/NOTES	22 Sep 2008 12:59:31 -0000
@@ -311,6 +311,7 @@
 #       (requires miibus)
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn:	Intel Wireless WiFi Link 4965AGN 802.11 network adapters
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
 # ral:	Ralink Technology IEEE 802.11 wireless adapter
@@ -322,6 +323,7 @@
 options 	ED_HPP
 options 	ED_SIC
 device		iwi
+device		iwn
 device		ipw
 device		nfe		# nVidia nForce MCP on-board Ethernet Networking
 device		nve		# nVidia nForce MCP on-board Ethernet Networking
Index: src/sys/conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.1243.2.23
diff -u -r1.1243.2.23 files
--- src/sys/conf/files	19 Jun 2008 04:23:26 -0000	1.1243.2.23
+++ src/sys/conf/files	22 Sep 2008 13:05:34 -0000
@@ -747,6 +747,21 @@
 dev/isp/isp_target.c		optional isp
 dev/ispfw/ispfw.c		optional ispfw
 dev/iwi/if_iwi.c		optional iwi
+dev/iwn/if_iwn.c		optional iwn
+iwnfw.c			optional iwnfw					\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+	no-implicit-rule before-depend local				\
+	clean		"iwnfw.c"
+iwnfw.fwo			optional iwnfw				\
+	dependency	"iwn.fw"					\
+	compile-with	"${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+	no-implicit-rule						\
+	clean		"iwn.fwo"
+iwn.fw			optional iwnfw					\
+	dependency	".PHONY"					\
+	compile-with	"uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu"	\
+	no-obj no-implicit-rule						\
+	clean		"iwn.fw"
 dev/ixgb/if_ixgb.c		optional ixgb
 dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/ixgb_hw.c		optional ixgb
Index: src/sys/i386/conf/NOTES
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/NOTES,v
retrieving revision 1.1244.2.4
diff -u -r1.1244.2.4 NOTES
--- src/sys/i386/conf/NOTES	3 Feb 2008 07:28:37 -0000	1.1244.2.4
+++ src/sys/i386/conf/NOTES	22 Sep 2008 12:59:10 -0000
@@ -594,6 +594,7 @@
 #       Intel EtherExpress
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# iwn:	Intel Wireless WiFi Link 4965AGN 802.11 network adapters
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
 # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133.
@@ -647,6 +648,7 @@
 hint.ie.2.irq="5"
 hint.ie.2.maddr="0xd0000"
 device		iwi
+device		iwn
 device		ipw
 # Hint for the i386-only ISA front-end of le(4).
 hint.le.0.at="isa"
Index: src/sys/modules/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/Makefile,v
retrieving revision 1.540.2.13
diff -u -r1.540.2.13 Makefile
--- src/sys/modules/Makefile	9 May 2008 02:20:39 -0000	1.540.2.13
+++ src/sys/modules/Makefile	22 Sep 2008 12:58:26 -0000
@@ -137,6 +137,8 @@
 	ispfw \
 	${_iwi} \
 	${_iwifw} \
+	${_iwn} \
+	${_iwnfw} \
 	${_ixgb} \
 	joy \
 	kbdmux \
@@ -468,6 +470,8 @@
 _ipwfw=		ipwfw
 _iwi=		iwi
 _iwifw=		iwifw
+_iwn=		iwn
+_iwnfw=		iwnfw
 _ixgb=   	ixgb
 _mly=		mly
 _nfe=		nfe
@@ -529,6 +533,8 @@
 _ips=		ips
 _ipw=		ipw
 _ipwfw=		ipwfw
+_iwn=		iwn
+_iwnfw=		iwnfw
 _ixgb=   	ixgb
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs