Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/macppc/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/macppc/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.103.2.1
retrieving revision 1.103.2.2
diff -u -p -r1.103.2.1 -r1.103.2.2
--- src/sys/arch/macppc/conf/GENERIC	2001/08/25 06:15:30	1.103.2.1
+++ src/sys/arch/macppc/conf/GENERIC	2001/09/13 01:13:57	1.103.2.2
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.103.2.1 2001/08/25 06:15:30 thorpej Exp $
+#	$NetBSD: GENERIC,v 1.103.2.2 2001/09/13 01:13:57 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include		"arch/macppc/conf/std.macppc"
 
-#ident 		"GENERIC-$Revision: 1.103.2.1 $"
+#ident 		"GENERIC-$Revision: 1.103.2.2 $"
 
 maxusers	32
 
@@ -138,6 +138,7 @@ ep*	at pci? dev ? function ?	# 3Com 3c59
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
+lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 rtk*	at pci? dev ? function ?	# Realtek 8129/8139
 sip*	at pci? dev ? function ?	# SiS 900/7016 Ethernet
@@ -147,6 +148,7 @@ options 	TLP_MATCH_21041
 options 	TLP_MATCH_21140
 options 	TLP_MATCH_21142
 adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
 ahc*	at pci? dev ? function ?	# Adaptec 294x, aic78x0 SCSI
 bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
 iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
@@ -333,6 +335,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+#pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	openfirm		# /dev/openfirm