[src/trunk]: src/sys/arch/i386/conf add some more devices and options.

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5219c7bf269f
branches:  trunk
changeset: 781686:5219c7bf269f
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Sep 23 01:03:39 2012 +0000

description:
add some more devices and options.

diffstat:

 sys/arch/i386/conf/ALL |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r caf0e8f1a7a7 -r 5219c7bf269f sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sun Sep 23 01:01:17 2012 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Sep 23 01:03:39 2012 +0000
@@ -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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 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