Module Name: src Committed By: christos Date: Tue Apr 8 19:40:57 UTC 2014
Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: add ixg To generate a diff of this commit: cvs rdiff -u -r1.370 -r1.371 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1101 -r1.1102 src/sys/arch/i386/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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.370 src/sys/arch/i386/conf/ALL:1.371 --- src/sys/arch/i386/conf/ALL:1.370 Mon Mar 24 10:15:38 2014 +++ src/sys/arch/i386/conf/ALL Tue Apr 8 15:40:57 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.370 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: ALL,v 1.371 2014/04/08 19:40:57 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/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.370 $" +#ident "ALL-$Revision: 1.371 $" maxusers 64 # estimated number of users @@ -1017,6 +1017,7 @@ 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 Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1101 src/sys/arch/i386/conf/GENERIC:1.1102 --- src/sys/arch/i386/conf/GENERIC:1.1101 Mon Mar 24 10:15:38 2014 +++ src/sys/arch/i386/conf/GENERIC Tue Apr 8 15:40:57 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1101 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: GENERIC,v 1.1102 2014/04/08 19:40:57 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1101 $" +#ident "GENERIC-$Revision: 1.1102 $" maxusers 64 # estimated number of users @@ -962,6 +962,7 @@ 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