Module Name: src
Committed By: riz
Date: Mon Feb 11 21:39:39 UTC 2013
Modified Files:
src/sys/arch/amd64/conf [netbsd-6]: XEN3_DOM0
src/sys/arch/i386/conf [netbsd-6]: XEN3_DOM0
Log Message:
Pull up following revision(s) (requested by khorben in ticket #815):
sys/arch/amd64/conf/XEN3_DOM0: revision 1.92
sys/arch/i386/conf/XEN3_DOM0: revision 1.72
Added wpi(4) to the XEN3_DOM0 kernel for both amd64 and i386
Tested on a Lenovo ThinkPad T60 2007 (amd64)
To generate a diff of this commit:
cvs rdiff -u -r1.77.2.8 -r1.77.2.9 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.60.2.6 -r1.60.2.7 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.8 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.9
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.8 Sat Dec 1 09:56:11 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Feb 11 21:39:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77.2.8 2012/12/01 09:56:11 msaitoh Exp $
+# $NetBSD: XEN3_DOM0,v 1.77.2.9 2013/02/11 21:39:39 riz Exp $
include "arch/amd64/conf/std.xen"
@@ -373,6 +373,7 @@ vge* at pci? dev ? function ? # VIATech
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
wm* at pci? dev ? function ? # Intel 8254x gigabit
+wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG
xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE
# MII/PHY support
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.6 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.7
--- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.6 Wed Oct 17 21:33:16 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Feb 11 21:39:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.6 2012/10/17 21:33:16 riz Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.7 2013/02/11 21:39:39 riz Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -350,6 +350,7 @@ vge* at pci? dev ? function ? # VIATech
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
wm* at pci? dev ? function ? # Intel 8254x gigabit
+wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG
xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE
# MII/PHY support