s/controller/device/ as per config(8) changes

2 files changed, 63 insertions, 63 deletions

diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index 27e3cda..b268f1f 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -67,21 +67,21 @@ options 	SYSVSEM			#SYSV-style semaphores
 #options 	NAPIC=1			# number of IO APICs
 #options 	NINTR=24		# number of INTs
 
-controller	isa0
-controller	eisa0
-controller	pci0
-controller	pccard0
-# controller	cardbus0
+device		isa0
+device		eisa0
+device		pci0
+device		pccard0
+#device		cardbus0
 
 # Floppy drives
-controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
+device		fdc0	at isa? port IO_FD1 irq 6 drq 2
 device		fd0	at fdc0 drive 0
 device		fd1	at fdc0 drive 1
 
 # ATA and ATAPI devices
-controller	ata0	at isa? port IO_WD1 irq 14
-controller	ata1	at isa? port IO_WD2 irq 15
-controller	ata2
+device		ata0	at isa? port IO_WD1 irq 14
+device		ata1	at isa? port IO_WD2 irq 15
+device		ata2
 device		atadisk0	# ATA disk drives
 device		atapicd0	# ATAPI CDROM drives
 device		atapifd0	# ATAPI floppy drives
@@ -92,23 +92,23 @@ options 	ATA_STATIC_ID		#Static device numbering
 # SCSI Controllers
 # A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
 # sufficient for any number of installed devices.
-controller	ahb0		# EISA AHA1742 family
-controller	ahc0		# AHA2940 and onboard AIC7xxx devices
-controller	amd0		# AMD 53C974 (Teckram DC-390(T))
-controller	dpt0		# DPT Smartcache - See LINT for options!
-controller	isp0		# Qlogic family
-controller	ncr0		# NCR/Symbios Logic
-#controller	sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
-
-controller	adv0	at isa? port ? irq ?
-controller	adw0
-controller	bt0	at isa? port ? irq ?
-controller	aha0	at isa? port ? irq ?
-controller	aic0	at isa? port ? irq ?
+device		ahb0		# EISA AHA1742 family
+device		ahc0		# AHA2940 and onboard AIC7xxx devices
+device		amd0		# AMD 53C974 (Teckram DC-390(T))
+device		dpt0		# DPT Smartcache - See LINT for options!
+device		isp0		# Qlogic family
+device		ncr0		# NCR/Symbios Logic
+#device		sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
+
+device		adv0	at isa? port ? irq ?
+device		adw0
+device		bt0	at isa? port ? irq ?
+device		aha0	at isa? port ? irq ?
+device		aic0	at isa? port ? irq ?
 
 # SCSI peripherals
 # Only one of each of these is needed, they are dynamically allocated.
-controller	scbus0		# SCSI bus (required)
+device		scbus0		# SCSI bus (required)
 device		da0		# Direct Access (disks)
 device		sa0		# Sequential Access (tape etc)
 device		cd0		# CD
@@ -119,7 +119,7 @@ device		pass0		# Passthrough device (direct SCSI access)
 #device		mlx0		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-controller	atkbdc0	at isa? port IO_KBD
+device		atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 device		psm0	at atkbdc? irq 12
 
@@ -145,8 +145,8 @@ device		npx0	at nexus? port IO_NPX irq 13
 device		apm0    at nexus? flags 0x20 # Advanced Power Management
 
 # PCCARD (PCMCIA) support
-controller	pcic0	at isa? port 0x3e0 irq 10 iomem 0xd0000
-# controller	pccbb0
+device		pcic0	at isa? port 0x3e0 irq 10 iomem 0xd0000
+#device		pccbb0
 
 # Serial (COM) ports
 device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
@@ -156,11 +156,11 @@ device		sio3	at isa? disable port IO_COM4 irq 9
 
 # Parallel port
 device		ppc0	at isa? port? flags 0x40 irq 7
-controller	ppbus0		# Parallel port bus (required)
+device		ppbus0		# Parallel port bus (required)
 device		lpt0		# Printer
 device		plip0		# TCP/IP over parallel
 device		ppi0		# Parallel port interface device
-#controller	vpo0		# Requires scbus and da0
+#device		vpo0		# Requires scbus and da0
 
 # PCI Ethernet NICs.
 device		de0		# DEC/Intel DC21x4x (``Tulip'')
@@ -169,7 +169,7 @@ device		tx0		# SMC 9432TX (83c170 ``EPIC'')
 device		vx0		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
-controller	miibus0		# MII bus support
+device		miibus0		# MII bus support
 device		dc0		# DEC/Intel 21143 and various workalikes
 device		rl0		# RealTek 8129/8139
 device		sf0		# Adaptec AIC-6915 (``Starfire'')
@@ -215,14 +215,14 @@ pseudo-device	md		# Memory "disks"
 pseudo-device	bpf		#Berkeley packet filter
 
 # USB support
-#controller	uhci0		# UHCI PCI->USB interface
-#controller	ohci0		# OHCI PCI->USB interface
-#controller	usb0		# USB Bus (required)
+#device		uhci0		# UHCI PCI->USB interface
+#device		ohci0		# OHCI PCI->USB interface
+#device		usb0		# USB Bus (required)
 #device		ugen0		# Generic
 #device		uhid0		# "Human Interface Devices"
 #device		ukbd0		# Keyboard
 #device		ulpt0		# Printer
-#controller	umass0		# Disks/Mass storage - Requires scbus and da0
+#device		umass0		# Disks/Mass storage - Requires scbus and da0
 #device		ums0		# Mouse
 #device		aue0		# ADMtek USB ethernet
 #device		kue0		# Kawasaki LSI USB ethernet
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index c158da1..079010b 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -59,19 +59,19 @@ options 	SYSVSEM			#SYSV-style semaphores
 #options 	NAPIC=1			# number of IO APICs
 #options 	NINTR=24		# number of INTs
 
-controller	isa0
-controller	eisa0
-controller	pci0
+device		isa0
+device		eisa0
+device		pci0
 
 # Floppy drives
-controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
+device		fdc0	at isa? port IO_FD1 irq 6 drq 2
 device		fd0	at fdc0 drive 0
 device		fd1	at fdc0 drive 1
 
 # ATA and ATAPI devices
-controller	ata0	at isa? port IO_WD1 irq 14
-controller	ata1	at isa? port IO_WD2 irq 15
-controller	ata2
+device		ata0	at isa? port IO_WD1 irq 14
+device		ata1	at isa? port IO_WD2 irq 15
+device		ata2
 device		atadisk0	# ATA disk drives
 device		atapicd0	# ATAPI CDROM drives
 device		atapifd0	# ATAPI floppy drives
@@ -82,23 +82,23 @@ options 	ATA_STATIC_ID		#Static device numbering
 # SCSI Controllers
 # A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
 # sufficient for any number of installed devices.
-controller	ahb0		# EISA AHA1742 family
-controller	ahc0		# AHA2940 and onboard AIC7xxx devices
-controller	amd0		# AMD 53C974 (Teckram DC-390(T))
-controller	dpt0		# DPT Smartcache - See LINT for options!
-controller	isp0		# Qlogic family
-controller	ncr0		# NCR/Symbios Logic
-#controller	sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
-
-controller	adv0	at isa? port ? irq ?
-controller	adw0
-controller	bt0	at isa? port ? irq ?
-controller	aha0	at isa? port ? irq ?
-controller	aic0	at isa? port ? irq ?
+device		ahb0		# EISA AHA1742 family
+device		ahc0		# AHA2940 and onboard AIC7xxx devices
+device		amd0		# AMD 53C974 (Teckram DC-390(T))
+device		dpt0		# DPT Smartcache - See LINT for options!
+device		isp0		# Qlogic family
+device		ncr0		# NCR/Symbios Logic
+#device		sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
+
+device		adv0	at isa? port ? irq ?
+device		adw0
+device		bt0	at isa? port ? irq ?
+device		aha0	at isa? port ? irq ?
+device		aic0	at isa? port ? irq ?
 
 # SCSI peripherals
 # Only one of each of these is needed, they are dynamically allocated.
-controller	scbus0		# SCSI bus (required)
+device		scbus0		# SCSI bus (required)
 device		da0		# Direct Access (disks)
 device		sa0		# Sequential Access (tape etc)
 device		cd0		# CD
@@ -109,7 +109,7 @@ device		pass0		# Passthrough device (direct SCSI access)
 #device		mlx0		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-controller	atkbdc0	at isa? port IO_KBD
+device		atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 device		psm0	at atkbdc? irq 12
 
@@ -135,7 +135,7 @@ device		npx0	at nexus? port IO_NPX irq 13
 device		apm0    at nexus? flags 0x20 # Advanced Power Management
 
 # PCCARD (PCMCIA) support
-controller	card0
+device		card0
 device		pcic0	at isa?
 device		pcic1	at isa?
 
@@ -147,11 +147,11 @@ device		sio3	at isa? disable port IO_COM4 irq 9
 
 # Parallel port
 device		ppc0	at isa? port? flags 0x40 irq 7
-controller	ppbus0		# Parallel port bus (required)
+device		ppbus0		# Parallel port bus (required)
 device		lpt0		# Printer
 device		plip0		# TCP/IP over parallel
 device		ppi0		# Parallel port interface device
-#controller	vpo0		# Requires scbus and da0
+#device		vpo0		# Requires scbus and da0
 
 
 # PCI Ethernet NICs.
@@ -161,7 +161,7 @@ device		tx0		# SMC 9432TX (83c170 ``EPIC'')
 device		vx0		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
-controller	miibus0		# MII bus support
+device		miibus0		# MII bus support
 device		dc0		# DEC/Intel 21143 and various workalikes
 device		rl0		# RealTek 8129/8139
 device		sf0		# Adaptec AIC-6915 (``Starfire'')
@@ -206,14 +206,14 @@ pseudo-device	md		# Memory "disks"
 pseudo-device	bpf		#Berkeley packet filter
 
 # USB support
-#controller	uhci0		# UHCI PCI->USB interface
-#controller	ohci0		# OHCI PCI->USB interface
-#controller	usb0		# USB Bus (required)
+#device		uhci0		# UHCI PCI->USB interface
+#device		ohci0		# OHCI PCI->USB interface
+#device		usb0		# USB Bus (required)
 #device		ugen0		# Generic
 #device		uhid0		# "Human Interface Devices"
 #device		ukbd0		# Keyboard
 #device		ulpt0		# Printer
-#controller	umass0		# Disks/Mass storage - Requires scbus and da0
+#device		umass0		# Disks/Mass storage - Requires scbus and da0
 #device		ums0		# Mouse
 #device		aue0		# ADMtek USB ethernet
 #device		kue0		# Kawasaki LSI USB ethernet