Module Name: src Committed By: christos Date: Tue Apr 8 19:42:13 UTC 2014
Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: add ixg To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.383 -r1.384 src/sys/arch/amd64/conf/GENERIC 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/ALL diff -u src/sys/arch/amd64/conf/ALL:1.2 src/sys/arch/amd64/conf/ALL:1.3 --- src/sys/arch/amd64/conf/ALL:1.2 Mon Mar 24 10:15:37 2014 +++ src/sys/arch/amd64/conf/ALL Tue Apr 8 15:42:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.2 2014/03/24 14:15:37 szptvlfn Exp $ +# $NetBSD: ALL,v 1.3 2014/04/08 19:42:13 christos Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.2 $" +#ident "ALL-$Revision: 1.3 $" maxusers 64 # estimated number of users @@ -891,11 +891,12 @@ hme* at pci? dev ? function ? # Sun Micr ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 -malo* at pci? dev ? function ? # Marvell Libertas Wireless +malo* at pci? dev ? function ? # Marvell Libertas Wireless mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.383 src/sys/arch/amd64/conf/GENERIC:1.384 --- src/sys/arch/amd64/conf/GENERIC:1.383 Mon Mar 24 10:15:37 2014 +++ src/sys/arch/amd64/conf/GENERIC Tue Apr 8 15:42:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.383 2014/03/24 14:15:37 szptvlfn Exp $ +# $NetBSD: GENERIC,v 1.384 2014/04/08 19:42:13 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.383 $" +#ident "GENERIC-$Revision: 1.384 $" maxusers 64 # estimated number of users @@ -711,6 +711,7 @@ gsip* at pci? dev ? function ? # NS83820 ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ le* at pci? dev ? function ? # PCnet-PCI Ethernet