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/i386/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.697
retrieving revision 1.698
diff -u -p -r1.697 -r1.698
--- src/sys/arch/i386/conf/GENERIC	2005/09/06 02:03:52	1.697
+++ src/sys/arch/i386/conf/GENERIC	2005/09/09 16:26:19	1.698
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.697 2005/09/06 02:03:52 dogcow Exp $
+# $NetBSD: GENERIC,v 1.698 2005/09/09 16:26:19 drochner 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.697 $"
+#ident 		"GENERIC-$Revision: 1.698 $"
 
 maxusers	32		# estimated number of users
 
@@ -525,7 +525,7 @@ pcmcom* at pcmcia? function ?		# PCMCIA 
 com*	at pcmcom? slave ?		# ...and the slave devices
 
 # CardBus serial interfaces
-#com*	at cardbus? dev ? function ?	# Modems and serial cards
+#com*	at cardbus? function ?	# Modems and serial cards
 
 # ISA serial interfaces
 #options 	COM_HAYESP		# adds Hayes ESP serial board support
@@ -638,9 +638,9 @@ wds0	at isa? port 0x350 irq 15 drq 6	# W
 wds1	at isa? port 0x358 irq 11 drq 5
 
 # CardBus SCSI cards
-#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
-#njs*	at cardbus? dev ? function ?	# Workbit NinjaSCSI-32
+#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+#ahc*	at cardbus? function ?	# Adaptec ADP-1480
+#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
 
 # MCA SCSI cards
 aha*	at mca? slot ?			# Adaptec AHA-1640
@@ -875,13 +875,13 @@ we0	at isa? port 0x280 iomem 0xd0000 irq
 we1	at isa? port 0x300 iomem 0xcc000 irq 10
 
 # CardBus network cards
-#ath*	at cardbus? dev ? function ?	# Atheros 5210/5211/5212 802.11
-#atw*	at cardbus? dev ? function ?	# ADMtek ADM8211 (802.11)
-#ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
-#fxp*	at cardbus? dev ? function ?	# Intel i8255x
-#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
-#rtw*	at cardbus? dev ? function ?	# Realtek 8180L (802.11)
-#tlp*	at cardbus? dev ? function ?	# DECchip 21143
+#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
+#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
+#ex*	at cardbus? function ?	# 3Com 3C575TX
+#fxp*	at cardbus? function ?	# Intel i8255x
+#rtk*	at cardbus? function ?	# Realtek 8129/8139
+#rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
+#tlp*	at cardbus? function ?	# DECchip 21143
 
 # MCA network cards
 elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
@@ -929,8 +929,8 @@ ohci*	at pci?	dev ? function ?	# Open Ho
 uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)
 
 # CardBus USB controllers
-#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
-#ohci*	at cardbus? dev ? function ?	# Open Host Controller
+#ehci*	at cardbus? function ?	# Enhanced Host Controller
+#ohci*	at cardbus? function ?	# Open Host Controller
 
 # ISA USB controllers
 #slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
@@ -1065,7 +1065,7 @@ irframe* at oboe?
 fwohci*	at pci? dev ? function ?	# IEEE1394 Open Host Controller
 
 # CardBus IEEE1394 controllers
-#fwohci*	at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
+#fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
 
 ieee1394if* at fwohci?
 fwip*	at ieee1394if?			# IP over IEEE1394