Module Name: src
Committed By: chs
Date: Sun Sep 23 01:03:40 UTC 2012
Modified Files:
src/sys/arch/i386/conf: ALL
Log Message:
add some more devices and options.
To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 src/sys/arch/i386/conf/ALL
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.343 src/sys/arch/i386/conf/ALL:1.344
--- src/sys/arch/i386/conf/ALL:1.343 Sat Sep 1 18:17:50 2012
+++ src/sys/arch/i386/conf/ALL Sun Sep 23 01:03:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.343 2012/09/01 18:17:50 jakllsch Exp $
+# $NetBSD: ALL,v 1.344 2012/09/23 01:03:39 chs 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.343 $"
+#ident "ALL-$Revision: 1.344 $"
maxusers 64 # estimated number of users
@@ -125,6 +125,7 @@ makeoptions DEBUG="-g" # compile full sy
options SYSCALL_STATS # per syscall counts
options SYSCALL_TIMES # per syscall times
options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
+options KDTRACE_HOOKS # kernel DTrace hooks
# Compatibility options
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
@@ -573,7 +574,8 @@ machfb* at pci? dev ? function ?
pm2fb* at pci? dev ? function ?
r128fb* at pci? dev ? function ?
radeonfb* at pci? dev ? function ?
-unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console
+tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics
+unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console
voodoofb* at pci? dev ? function ?
wcfb* at pci? dev ? function ?
wsdisplay* at wsemuldisplaydev?
@@ -1003,6 +1005,7 @@ et* at pci? dev ? function ? # Agere/LSI
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
+gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
@@ -1657,9 +1660,6 @@ options VND_COMPRESSION # compressed v
pseudo-device dm # device-mapper disk driver
-# NPF
-pseudo-device npf
-
# network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
pseudo-device carp # Common Address Redundancy Protocol
@@ -1684,7 +1684,8 @@ options BRIDGE_IPF # bridge uses IP/IP
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pf # PF packet filter
pseudo-device pflog # PF log if
-pseudo-device pfsync
+pseudo-device pfsync # PF sync if
+pseudo-device npf # NPF packet filter
pseudo-device kttcp
pseudo-device etherip # EtherIP
# srt is EXPERIMENTAL
