cleanup deafult locators (blah ?); please check that your most hated architecture is still fluffy (;

1 files changed, 181 insertions, 181 deletions

diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 14a8f93acf4..674ccbb9eec 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.79 2004/08/27 22:03:02 drahn Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.80 2004/09/16 09:14:03 mickey Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -43,8 +43,8 @@ config		bsd	root on rd0a swap on rd0b and wd0b and sd0b
 
 mainbus0 at root
 
-cpu0	at mainbus? apid ?
-bios0	at mainbus0 apid ?
+cpu0	at mainbus?
+bios0	at mainbus0
 apm0	at bios0 flags 0x0000	# flags 0x0101 to force protocol version 1.1
 #option	APMDEBUG
 pcibios0 at bios0 flags 0x0000
@@ -59,18 +59,18 @@ pci*	at mainbus0
 option		PCIVERBOSE
 #option		EISAVERBOSE
 
-pchb*	at pci? dev ? function ?	# PCI-Host bridges
-ppb*	at pci? dev ? function ?	# PCI-PCI bridges
-pci*	at ppb? bus ?
-pci*	at pchb? bus ?
-pcib*	at pci? dev ? function ?	# PCI-ISA bridge
-ichpcib* at pci? dev ? function ?	# Intel ICHx/ICHx-M LPC bridges
-gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA bridge
+pchb*	at pci?			# PCI-Host bridges
+ppb*	at pci?			# PCI-PCI bridges
+pci*	at ppb?
+pci*	at pchb?
+pcib*	at pci?			# PCI-ISA bridge
+ichpcib* at pci?		# Intel ICHx/ICHx-M LPC bridges
+gscpcib* at pci?		# NS Geode SC1100 PCI-ISA bridge
 
 # CardBus bus support
 cardbus*	at cardslot?
 pcmcia*		at cardslot?
-cbb*		at pci? dev ? function ?
+cbb*		at pci?
 cardslot*	at cbb?
 
 # ISA PCMCIA controllers
@@ -79,79 +79,79 @@ pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 pcic2	at isa? port 0x3e4 iomem 0xd4000 iosiz 0x4000
 
 # PCI PCMCIA controllers
-pcic*	at pci? dev? function ?
+pcic*	at pci?
 
 # PCMCIA bus support
-pcmcia*	at pcic? controller ? socket ?
+pcmcia*	at pcic?
 
 # PCI USB Controllers
-ehci*	at pci?				# Enhanced Host Controller
-uhci*	at pci?				# Universal Host Controller (Intel)
-ohci*	at pci?				# Open Host Controller
+ehci*	at pci?			# Enhanced Host Controller
+uhci*	at pci?			# Universal Host Controller (Intel)
+ohci*	at pci?			# Open Host Controller
 
 # USB bus support
 usb*	at ehci?
 usb*	at uhci?
 usb*	at ohci?
 
-uhub*	at usb?				# USB Hubs
-uhub*	at uhub? port ? configuration ?	# USB Hubs
-#uhid*	at uhub? port ? configuration ?	# USB Generic HID devices
-#umodem*	at uhub? port ? configuration ?	# USB Modems/Serial
+uhub*	at usb?			# USB Hubs
+uhub*	at uhub?		# USB Hubs
+#uhid*	at uhub?		# USB Generic HID devices
+#umodem*	at uhub?	# USB Modems/Serial
 #ucom*	at umodem?
-#uvisor*	at uhub? port ? configuration ?	# Handspring Visor
+#uvisor*	at uhub?	# Handspring Visor
 #ucom*	at uvisor?
-#uftdi*	at uhub? port ?
-#ucom*	at uftdi? portno ?
-#uaudio* at uhub? port ? configuration ?# USB Audio
-#ulpt*	at uhub? port ? configuration ? # USB Printers
-uhidev*	at uhub? port ? configuration ? interface ?
-ukbd*	at uhidev? reportid ?
-wskbd*	at ukbd? console ? mux 1
-umass*	at uhub? port ? configuration ? # USB Mass Storage devices
+#uftdi*	at uhub?
+#ucom*	at uftdi?
+#uaudio* at uhub?		# USB Audio
+#ulpt*	at uhub?		# USB Printers
+uhidev*	at uhub?
+ukbd*	at uhidev?
+wskbd*	at ukbd? mux 1
+umass*	at uhub?		# USB Mass Storage devices
 scsibus* at umass?
-#ums*	at uhidev? reportid ?
+#ums*	at uhidev?
 #wsmouse* at ums? mux 0
-aue*	at uhub? port ?			# ADMtek AN986 Pegasus Ethernet
-axe*	at uhub? port ?			# ASIX Electronics AX88172 USB Ethernet
-cue*	at uhub? port ?			# CATC USB-EL1201A based Ethernet
-kue*	at uhub? port ?			# Kawasaki KL5KUSB101B based Ethernet
-upl*	at uhub? port ?			# Prolific PL2301/PL2302 host-to-host `network'
-urio*	at uhub? port ?			# Diamond Multimedia Rio 500
-cdce*	at uhub? port ?			# CDC Ethernet
-upl*	at uhub? port ?			# Prolific PL2301/PL2302 host-to-host `network'
-url*	at uhub? port ?			# Realtek RTL8150L based adapters
-wi*	at uhub? port ?			# WaveLAN IEEE 802.11DS
-#uscanner* at uhub? port ?		# USB Scanners
-#usscanner* at uhub? port ?		# USB SCSI scanners, e.g., HP5300
+aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
+axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
+cue*	at uhub?		# CATC USB-EL1201A based Ethernet
+kue*	at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
+urio*	at uhub?		# Diamond Multimedia Rio 500
+cdce*	at uhub?		# CDC Ethernet
+upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
+url*	at uhub?		# Realtek RTL8150L based adapters
+wi*	at uhub?		# WaveLAN IEEE 802.11DS
+#uscanner* at uhub?		# USB Scanners
+#usscanner* at uhub?		# USB SCSI scanners, e.g., HP5300
 #scsibus* at usscanner?
-#uyap*	at uhub? port ?			# Y@P firmware loader
-#ugen*	at uhub? port ? configuration ? # USB Generic driver
+#uyap*	at uhub?		# Y@P firmware loader
+#ugen*	at uhub?		# USB Generic driver
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
 
-pckbc0		at isa?			# PC keyboard controller
-pckbd*		at pckbc?		# PC keyboard
-wskbd*		at pckbd? console ?
+pckbc0		at isa?		# PC keyboard controller
+pckbd*		at pckbc?	# PC keyboard
+wskbd*		at pckbd?
 vga0		at isa?
-vga*		at pci? dev ? function ?
-pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
-wsdisplay*	at vga? console ?
-wsdisplay*	at pcdisplay? console ?
+vga*		at pci?
+pcdisplay0	at isa?		# CGA, MDA, EGA, HGA
+wsdisplay*	at vga?
+wsdisplay*	at pcdisplay?
 
 pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 pccom1	at isa? port 0x2f8 irq 3
 pccom2	at isa? port 0x3e8 irq 5
 #pccom3	at isa? port 0x2e8 irq 9
 #ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#pccom*	at ast? slave ?
+#pccom*	at ast?
 #boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#pccom*	at boca? slave ?
+#pccom*	at boca?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#pccom*	at rtfps? slave ?
-pccom*	at pcmcia? function ?		# PCMCIA modem cards
+#pccom*	at rtfps?
+pccom*	at pcmcia?			# PCMCIA modem cards
 pccom*	at isapnp?
 
 # option for using CD1400 handshaking for incoming data
@@ -164,193 +164,193 @@ pccom*	at isapnp?
 #lpt1	at isa? port 0x278
 #lpt2	at isa? port 0x3bc
 
-bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
-bha1	at isa? disable port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers
-bha2	at isa? disable port ? irq ?
-bha*	at pci? dev ? function ?
-#bha*	at eisa? slot ?			# XXX eisa still runs in isa-compat
+bha0	at isa? port 0x330	# BusLogic [57]4X SCSI controllers
+bha1	at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers
+bha2	at isa? disable
+bha*	at pci? 
+#bha*	at eisa?		# XXX eisa still runs in isa-compat
 scsibus* at bha?
-aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
-aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
+aha0	at isa? port 0x330	# Adaptec 154[02] SCSI controllers
+aha1	at isa? port 0x334	# Adaptec 154[02] SCSI controllers
 aha*	at isapnp?
 scsibus* at aha?
-ahb*	at eisa? slot ?			# Adaptec 174[024] SCSI controllers
+ahb*	at eisa?		# Adaptec 174[024] SCSI controllers
 scsibus* at ahb?
-ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI controllers
-ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
-ahc*	at pci? dev ? function ?	# Adaptec 2940/3940/78?? SCSI controllers
+ahc0	at isa?			# Adaptec 284x SCSI controllers
+ahc*	at eisa?		# Adaptec 274x, aic7770 SCSI controllers
+ahc*	at pci?			# Adaptec 2940/3940/78?? SCSI controllers
 scsibus* at ahc?
-ahd*	at pci? dev ? function ?	# Adaptec 79?? SCSI controllers
+ahd*	at pci?			# Adaptec 79?? SCSI controllers
 scsibus* at ahd?
-mpt*	at pci? dev ? function ?	# LSI Fusion-MPT SCSI/Fibre
+mpt*	at pci?			# LSI Fusion-MPT SCSI/Fibre
 scsibus* at mpt?
-dpt*	at pci? dev ? function ?        # DPT SmartCache/SmartRAID PCI
-dpt*	at eisa? slot ?			# DPT SmartCache/SmartRAID EISA
+dpt*	at pci?			# DPT SmartCache/SmartRAID PCI
+dpt*	at eisa?		# DPT SmartCache/SmartRAID EISA
 scsibus* at dpt?
-gdt*	at pci? dev ? function ?	# ICP Vortex GDT RAID controllers
+gdt*	at pci?			# ICP Vortex GDT RAID controllers
 scsibus* at gdt?
-aac*	at pci? dev ? function ?	# Adaptec FSA RAID controllers
+aac*	at pci?			# Adaptec FSA RAID controllers
 scsibus* at aac?
-ami*	at pci? dev ? function ?	# AMI MegaRAID controllers
+ami*	at pci?			# AMI MegaRAID controllers
 scsibus* at ami?
-cac*	at pci? dev ? function ?	# Compaq Smart ARRAY RAID controllers
-cac*	at eisa? slot ?
+cac*	at pci?			# Compaq Smart ARRAY RAID controllers
+cac*	at eisa?
 scsibus* at cac?
-twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
+twe*	at pci?			# 3ware Escalade RAID controllers
 scsibus* at twe?
-iha*	at pci? dev ? function ?	# Initio Ultra/UltraWide SCSI controllers
+iha*	at pci?			# Initio Ultra/UltraWide SCSI controllers
 scsibus* at iha?
-isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
+isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
 aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
 aic*	at isapnp?
-aic*	at pcmcia? function ?		# PCMCIA based aic SCSI controllers
+aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
 scsibus* at aic?
-#ncr*	at pci? dev ? function ?	# NCR 538XX SCSI controllers(old)
+#ncr*	at pci?			# NCR 538XX SCSI controllers(old)
 #scsibus* at ncr?
-siop*	at pci? dev ? function ?	# NCR 538XX SCSI controllers(new)
+siop*	at pci?			# NCR 538XX SCSI controllers(new)
 scsibus* at siop?
-adv*	at pci? dev ? function ?	# AdvanSys 1200A/B and ULTRA SCSI
+adv*	at pci?			# AdvanSys 1200A/B and ULTRA SCSI
 scsibus* at adv?
-adw*	at pci? dev ? function ?	# AdvanSys ULTRA WIDE SCSI
+adw*	at pci?			# AdvanSys ULTRA WIDE SCSI
 scsibus* at adw?
-pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
+pcscp*	at pci?			# AMD 53c974 PCscsi-PCI SCSI
 scsibus* at pcscp?
 sea0	at isa? disable iomem 0xc8000 irq 5	# Seagate ST0[12] SCSI controllers
 scsibus* at sea?
-trm*	at pci? dev ? function ?	# Tekram DC-3x5U SCSI Controllers
+trm*	at pci?			# Tekram DC-3x5U SCSI Controllers
 scsibus* at trm?
-uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
-uha1	at isa? disable port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
-uha*	at eisa? slot ?			# UltraStor 24f SCSI controllers
+uha0	at isa? port 0x330	# UltraStor [13]4f SCSI controllers
+uha1	at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers
+uha*	at eisa?		# UltraStor 24f SCSI controllers
 scsibus* at uha?
 wds0	at isa? disable port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
 #wds1	at isa? port 0x358 irq 11 drq 5
 scsibus* at wds?
 
 # I2O
-iop*	at pci? dev ? function ?	# I2O
-ioprbs*	at iop? tid ?			# Random block storage
+iop*	at pci?			# I2O
+ioprbs*	at iop?			# Random block storage
 scsibus* at ioprbs?
 
-sd*	at scsibus? target ? lun ?	# SCSI disk drives
-st*	at scsibus? target ? lun ?	# SCSI tape drives
-cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
-#ch*	at scsibus? target ? lun ?	# SCSI autochangers
-#uk*	at scsibus? target ? lun ?	# SCSI unknown devices
+sd*	at scsibus?		# SCSI disk drives
+st*	at scsibus?		# SCSI tape drives
+cd*	at scsibus?		# SCSI CD-ROM drives
+#ch*	at scsibus?		# SCSI autochangers
+#uk*	at scsibus?		# SCSI unknown devices
 
 fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-#fdc1	at isa? port 0x370 irq ? drq ?
-fd*	at fdc? drive ?
+#fdc1	at isa? port 0x370
+fd*	at fdc?
 
 #mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
 
 # IDE controllers
-pciide* at pci ? dev ? function ? flags 0x0000
+pciide* at pci? flags 0x0000
 
 wdc0	at isa? port 0x1f0 irq 14 flags 0x00
 wdc1	at isa? port 0x170 irq 15 flags 0x00
-wdc*	at pcmcia? function ?
+wdc*	at pcmcia?
 wdc*	at isapnp?
 
 # IDE hard drives
-wd*	at wdc? channel ? drive ? flags 0x0000
-wd*	at pciide? channel ? drive ? flags 0x0000
+wd*	at wdc? flags 0x0000
+wd*	at pciide? flags 0x0000
 
 # ATAPI<->SCSI
-atapiscsi* at wdc? channel ?
-atapiscsi* at pciide? channel ?
+atapiscsi* at wdc?
+atapiscsi* at pciide?
 scsibus* at atapiscsi?
 
-#wt0	at isa? port 0x308 irq 5 drq 1		# Archive/Wangtek QIC tapes
+#wt0	at isa? port 0x308 irq 5 drq 1	# Archive/Wangtek QIC tapes
 
 we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
 we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
 we*	at isapnp?
 ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
-ne0	at isa? port 0x240 irq 9		# NE[12]000 ethernet
-ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet
-ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
-ne*	at isapnp?				# NE[12]000 PnP ethernet
-eg0	at isa? disable port 0x310 irq 5	# 3C505/Etherlink+ ethernet
-el0	at isa? disable port 0x300 irq 9	# 3C501 ethernet
-ep0	at isa? port ? irq ?			# 3C509 ethernet
-ep*	at isa? port ? irq ?			# 3C509 ethernet
-ef*	at isapnp?				# 3C515 PnP ethernet
+ne0	at isa? port 0x240 irq 9	# NE[12]000 ethernet
+ne1	at isa? port 0x300 irq 10	# NE[12]000 ethernet
+ne2	at isa? port 0x280 irq 9	# NE[12]000 ethernet
+ne*	at isapnp?			# NE[12]000 PnP ethernet
+eg0	at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet
+el0	at isa? disable port 0x300 irq 9 # 3C501 ethernet
+ep0	at isa?				# 3C509 ethernet
+ep*	at isa?				# 3C509 ethernet
+ef*	at isapnp?			# 3C515 PnP ethernet
 ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
-#ie1	at isa? port 0x300 irq 10		# EtherExpress
-le0	at isa? port 0x360 irq 15 drq 6		# IsoLan, NE2100, and DEPCA
-ex0	at isa? port 0x320 irq 5		# Intel EtherExpress PRO/10
-ep0	at eisa? slot ?
-ep*	at eisa? slot ?				# 3C579 ethernet
-ef*	at isapnp?				# 3C515 ethernet
-#fea*	at eisa? slot ?				# DEC DEFEA FDDI
-le*	at pci? dev ? function ?		# PCnet-PCI based ethernet
-ep*	at isapnp?				# 3C509 PnP ethernet
+#ie1	at isa? port 0x300 irq 10	# EtherExpress
+le0	at isa? port 0x360 irq 15 drq 6	# IsoLan, NE2100, and DEPCA
+ex0	at isa? port 0x320 irq 5	# Intel EtherExpress PRO/10
+ep0	at eisa?
+ep*	at eisa?			# 3C579 ethernet
+ef*	at isapnp?			# 3C515 ethernet
+#fea*	at eisa?			# DEC DEFEA FDDI
+le*	at pci?				# PCnet-PCI based ethernet
+ep*	at isapnp?			# 3C509 PnP ethernet
 le*	at isapnp?
-de*	at pci? dev ? function ?		# DC21X4X-based ethernet
-fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet
-fxp*	at cardbus? dev ? function ?		# Intel PRO/100 ethernet
-ep0	at pci? dev ? function ?		# 3C59x ethernet
-ep*	at pci? dev ? function ?		# 3C59x ethernet
-ne*	at pci? dev ? function ?		# NE2000-compat ethernet
-ne*	at pcmcia? function ?			# PCMCIA based NE2000 ethernet
-ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
-sm*	at pcmcia? function ?			# PCMCIA based sm ethernet
-xe*	at pcmcia? function ?			# Xircom ethernet
-fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI
-xl*	at pci? dev ? function ?		# 3C9xx ethernet
-xl*	at cardbus? dev ? function ?		# 3C575 ethernet
-rl*	at pci? dev ? function ?		# RealTek 81[23]9 ethernet
-tx*	at pci? dev ? function ?		# SMC 83C170 EPIC ethernet
-tl*	at pci? dev ? function ?		# Compaq Thunderlan ethernet
-vr*	at pci? dev ? function ?		# VIA Rhine ethernet
-dc*	at pci? dev ? function ?		# 21143, "tulip" clone ethernet
-sis*	at pci? dev ? function ?		# SiS 900/7016 ethernet
-wb*	at pci? dev ? function ?		# Winbond W89C840F ethernet
-ti*	at pci? dev ? function ?		# Alteon Tigon 1Gb ethernet
-skc*	at pci? dev ? function ?		# SysKonnect GEnesis 984x
-sk*	at skc?					#  each port of above
-em*	at pci? dev ? function ?		# Intel Pro/1000 ethernet
-txp*	at pci? dev ? function ?		# 3com 3CR990
-nge*	at pci? dev ? function ?		# NS DP83820/DP83821 GigE
-re*	at pci? dev ? function ?		# Realtek 8169/8169S/8110S
-stge*	at pci? dev ? function ?		# Sundance TC9021 GigE
-bge*	at pci? dev ? function ?		# Broadcom BCM570x (aka Tigon3)
-#lge*	at pci? dev ? function ?		# Level1 LXT1001 GigE
-mtd*	at pci? dev ? function ?		# Myson MTD803
-bce*	at pci? dev ? function ?		# Broadcom BCM4401
+de*	at pci?				# DC21X4X-based ethernet
+fxp*	at pci?				# EtherExpress 10/100B ethernet
+fxp*	at cardbus?			# Intel PRO/100 ethernet
+ep0	at pci?				# 3C59x ethernet
+ep*	at pci?				# 3C59x ethernet
+ne*	at pci?				# NE2000-compat ethernet
+ne*	at pcmcia?			# PCMCIA based NE2000 ethernet
+ep*	at pcmcia?			# PCMCIA based 3C5xx ethernet
+sm*	at pcmcia?			# PCMCIA based sm ethernet
+xe*	at pcmcia?			# Xircom ethernet
+fpa*	at pci?				# DEC DEFPA FDDI
+xl*	at pci?				# 3C9xx ethernet
+xl*	at cardbus?			# 3C575 ethernet
+rl*	at pci?				# RealTek 81[23]9 ethernet
+tx*	at pci?				# SMC 83C170 EPIC ethernet
+tl*	at pci?				# Compaq Thunderlan ethernet
+vr*	at pci?				# VIA Rhine ethernet
+dc*	at pci?				# 21143, "tulip" clone ethernet
+sis*	at pci?				# SiS 900/7016 ethernet
+wb*	at pci?				# Winbond W89C840F ethernet
+ti*	at pci?				# Alteon Tigon 1Gb ethernet
+skc*	at pci?				# SysKonnect GEnesis 984x
+sk*	at skc?				#  each port of above
+em*	at pci?				# Intel Pro/1000 ethernet
+txp*	at pci?				# 3com 3CR990
+nge*	at pci?				# NS DP83820/DP83821 GigE
+re*	at pci?				# Realtek 8169/8169S/8110S
+stge*	at pci?				# Sundance TC9021 GigE
+bge*	at pci?				# Broadcom BCM570x (aka Tigon3)
+#lge*	at pci?				# Level1 LXT1001 GigE
+mtd*	at pci?				# Myson MTD803
+bce*	at pci?				# Broadcom BCM4401
 
 # Wireless network cards
-wi*	at pci? dev ? function ?		# WaveLAN IEEE 802.11DS
-wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11DS
-#awi*	at pcmcia? function ?			# Bay Networks IEEE 802.11FH
-an*	at pcmcia? function ?			# Aironet IEEE 802.11DS
-#cnw*	at pcmcia? function ?			# Xircom Netwave
-ray*	at pcmcia? function ?			# Raylink Aviator2.4/Pro 802.11FH
+wi*	at pci?				# WaveLAN IEEE 802.11DS
+wi*	at pcmcia?			# WaveLAN IEEE 802.11DS
+#awi*	at pcmcia?			# Bay Networks IEEE 802.11FH
+an*	at pcmcia?			# Aironet IEEE 802.11DS
+#cnw*	at pcmcia?			# Xircom Netwave
+ray*	at pcmcia?			# Raylink Aviator2.4/Pro 802.11FH
 
 # Media Independent Interface (mii) drivers
-exphy*	at mii? phy ?				# 3Com internal PHYs
-inphy*	at mii? phy ?				# Intel 82555 PHYs
-iophy*	at mii? phy ?				# Intel 82553 PHYs
-icsphy*	at mii? phy ?				# ICS 1890 PHYs
-lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-nsphyter*	at mii? phy ?			# NS and compatible PHYs
-qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
-sqphy*	at mii? phy ?				# Seeq 8x220 PHYs
-rlphy* at mii? phy ?				# RealTek 8139 internal PHYs
-mtdphy*	at mii? phy ?				# Myson MTD972 PHYs
-dcphy*	at mii? phy ?				# Digital Clone PHYs
-acphy*	at mii? phy ?				# Altima AC101 PHYs
-amphy*	at mii? phy ?				# AMD 79C873 PHYs
-tqphy*	at mii? phy ?				# TDK 78Q212x PHYs
-brgphy*	at mii? phy ?				# Broadcom Gigabit PHYs
-eephy* at mii? phy ?				# Marvell 88E1000 series PHY
-xmphy*	at mii? phy ?				# XaQti XMAC-II PHYs
-bmtphy* at mii? phy ?				# Broadcom 10/100 PHYs
-rgephy*	at mii? phy ?				# Realtek 8169S/8110S PHY
-ukphy*	at mii? phy ?				# "unknown" PHYs
+exphy*	at mii?				# 3Com internal PHYs
+inphy*	at mii?				# Intel 82555 PHYs
+iophy*	at mii?				# Intel 82553 PHYs
+icsphy*	at mii?				# ICS 1890 PHYs
+lxtphy*	at mii?				# Level1 LXT970 PHYs
+nsphy*	at mii?				# NS and compatible PHYs
+nsphyter*	at mii?			# NS and compatible PHYs
+qsphy*	at mii?				# Quality Semi QS6612 PHYs
+sqphy*	at mii?				# Seeq 8x220 PHYs
+rlphy* at mii?				# RealTek 8139 internal PHYs
+mtdphy*	at mii?				# Myson MTD972 PHYs
+dcphy*	at mii?				# Digital Clone PHYs
+acphy*	at mii?				# Altima AC101 PHYs
+amphy*	at mii?				# AMD 79C873 PHYs
+tqphy*	at mii?				# TDK 78Q212x PHYs
+brgphy*	at mii?				# Broadcom Gigabit PHYs
+eephy* at mii?				# Marvell 88E1000 series PHY
+xmphy*	at mii?				# XaQti XMAC-II PHYs
+bmtphy* at mii?				# Broadcom 10/100 PHYs
+rgephy*	at mii?				# Realtek 8169S/8110S PHY
+ukphy*	at mii?				# "unknown" PHYs
 
 pseudo-device	loop	1		# network loopback
 #pseudo-device	sl	1		# CSLIP