Discourage usage of controller in kernel config files. Reflect this

by changing ``controller'' to ``device'' as per GENERIC and LINT.

18 files changed, 54 insertions, 54 deletions

diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 1c9c151..dc860b5 100644
--- a/share/man/man4/adv.4
+++ b/share/man/man4/adv.4
@@ -31,19 +31,19 @@
 .Nd Advansys ISA/VL/EISA/PCI 8bit SCSI Host adapter driver
 .Sh SYNOPSIS
 For one or more ISA or VL cards:
-.Cd controller isa0
-.Cd controller "adv0 at isa? port ? cam irq ? drq ?"
+.Cd device isa0
+.Cd device "adv0 at isa? port ? cam irq ? drq ?"
 .Pp
 For one or more EISA cards:
-.Cd controller eisa0
-.Cd controller adv0
+.Cd device eisa0
+.Cd device adv0
 .Pp
 For one or more PCI cards:
-.Cd controller pci0
-.Cd controller adv0
+.Cd device pci0
+.Cd device adv0
 .Pp
 For one or more SCSI busses:
-.Cd controller scbus0 at adv0
+.Cd device scbus0 at adv0
 .Sh DESCRIPTION
 This driver provides access to the 8bit
 .Tn SCSI
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index 0d49eb7..c55adae 100644
--- a/share/man/man4/aha.4
+++ b/share/man/man4/aha.4
@@ -33,8 +33,8 @@
 .Nm aha
 .Nd Adaptec SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd controller "aha0 at isa? port ? cam irq ? drq 5"
-.Cd controller scbus0 at aha0
+.Cd device "aha0 at isa? port ? cam irq ? drq 5"
+.Cd device scbus0 at aha0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index a0fced4..6db9620 100644
--- a/share/man/man4/ahb.4
+++ b/share/man/man4/ahb.4
@@ -33,8 +33,8 @@
 .Nm ahb
 .Nd Adaptec EISA SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd controller ahb0
-.Cd controller scbus0 at ahb0
+.Cd device ahb0
+.Cd device scbus0 at ahb0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index e4aaeee..76d0088 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -10,9 +10,9 @@
 .Sh SYNOPSIS
 .Nm device bktr0
 .Pp
-.Nm controller iicbus0
-.Nm controller iicbb0
-.Nm controller smbus0
+.Nm device iicbus0
+.Nm device iicbb0
+.Nm device smbus0
 .Sh DESCRIPTION
 The
 .Nm bktr
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index d4b4c2c..0dcdc18 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -33,8 +33,8 @@
 .Nm bt
 .Nd Buslogic/Mylex MultiMaster SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd "controller bt0 at isa? port ? cam irq ?"
-.Cd controller scbus0 at bt0
+.Cd "device bt0 at isa? port ? cam irq ?"
+.Cd device scbus0 at bt0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index 8741586..1cbb922 100644
--- a/share/man/man4/dpt.4
+++ b/share/man/man4/dpt.4
@@ -31,12 +31,12 @@
 .Nd DPT RAID Controller SCSI driver
 .Sh SYNOPSIS
 For one or more EISA Controllers
-.Cd "controller eisa0"
-.Cd "controller dpt0"
+.Cd "device eisa0"
+.Cd "device dpt0"
 .Pp
 For one or more PCI Controllers
-.Cd "controller pci0"
-.Cd "controller dpt0"
+.Cd "device pci0"
+.Cd "device dpt0"
 .Pp
 To allow PCI adapters to use memory mapped I/O if enabled:
 .Cd options DPT_ALLOW_MEMIO
diff --git a/share/man/man4/man4.i386/adv.4 b/share/man/man4/man4.i386/adv.4
index 1c9c151..dc860b5 100644
--- a/share/man/man4/man4.i386/adv.4
+++ b/share/man/man4/man4.i386/adv.4
@@ -31,19 +31,19 @@
 .Nd Advansys ISA/VL/EISA/PCI 8bit SCSI Host adapter driver
 .Sh SYNOPSIS
 For one or more ISA or VL cards:
-.Cd controller isa0
-.Cd controller "adv0 at isa? port ? cam irq ? drq ?"
+.Cd device isa0
+.Cd device "adv0 at isa? port ? cam irq ? drq ?"
 .Pp
 For one or more EISA cards:
-.Cd controller eisa0
-.Cd controller adv0
+.Cd device eisa0
+.Cd device adv0
 .Pp
 For one or more PCI cards:
-.Cd controller pci0
-.Cd controller adv0
+.Cd device pci0
+.Cd device adv0
 .Pp
 For one or more SCSI busses:
-.Cd controller scbus0 at adv0
+.Cd device scbus0 at adv0
 .Sh DESCRIPTION
 This driver provides access to the 8bit
 .Tn SCSI
diff --git a/share/man/man4/man4.i386/aha.4 b/share/man/man4/man4.i386/aha.4
index 0d49eb7..c55adae 100644
--- a/share/man/man4/man4.i386/aha.4
+++ b/share/man/man4/man4.i386/aha.4
@@ -33,8 +33,8 @@
 .Nm aha
 .Nd Adaptec SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd controller "aha0 at isa? port ? cam irq ? drq 5"
-.Cd controller scbus0 at aha0
+.Cd device "aha0 at isa? port ? cam irq ? drq 5"
+.Cd device scbus0 at aha0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/man4.i386/ahb.4 b/share/man/man4/man4.i386/ahb.4
index a0fced4..6db9620 100644
--- a/share/man/man4/man4.i386/ahb.4
+++ b/share/man/man4/man4.i386/ahb.4
@@ -33,8 +33,8 @@
 .Nm ahb
 .Nd Adaptec EISA SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd controller ahb0
-.Cd controller scbus0 at ahb0
+.Cd device ahb0
+.Cd device scbus0 at ahb0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index 64b9ff9..8e19183 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/man4.i386/alpm.4
@@ -31,8 +31,8 @@
 .Nm alpm
 .Nd Acer Aladdin 15x3 Power Management controller driver.
 .Sh SYNOPSIS
-.Cd controller smbus
-.Cd controller alpm0
+.Cd device smbus
+.Cd device alpm0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn Aladdin 15x3 Power Management Unit. Currently, only smbus controller 
diff --git a/share/man/man4/man4.i386/bktr.4 b/share/man/man4/man4.i386/bktr.4
index e4aaeee..76d0088 100644
--- a/share/man/man4/man4.i386/bktr.4
+++ b/share/man/man4/man4.i386/bktr.4
@@ -10,9 +10,9 @@
 .Sh SYNOPSIS
 .Nm device bktr0
 .Pp
-.Nm controller iicbus0
-.Nm controller iicbb0
-.Nm controller smbus0
+.Nm device iicbus0
+.Nm device iicbb0
+.Nm device smbus0
 .Sh DESCRIPTION
 The
 .Nm bktr
diff --git a/share/man/man4/man4.i386/bt.4 b/share/man/man4/man4.i386/bt.4
index d4b4c2c..0dcdc18 100644
--- a/share/man/man4/man4.i386/bt.4
+++ b/share/man/man4/man4.i386/bt.4
@@ -33,8 +33,8 @@
 .Nm bt
 .Nd Buslogic/Mylex MultiMaster SCSI host adapter driver
 .Sh SYNOPSIS
-.Cd "controller bt0 at isa? port ? cam irq ?"
-.Cd controller scbus0 at bt0
+.Cd "device bt0 at isa? port ? cam irq ?"
+.Cd device scbus0 at bt0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/man4.i386/dpt.4 b/share/man/man4/man4.i386/dpt.4
index 8741586..1cbb922 100644
--- a/share/man/man4/man4.i386/dpt.4
+++ b/share/man/man4/man4.i386/dpt.4
@@ -31,12 +31,12 @@
 .Nd DPT RAID Controller SCSI driver
 .Sh SYNOPSIS
 For one or more EISA Controllers
-.Cd "controller eisa0"
-.Cd "controller dpt0"
+.Cd "device eisa0"
+.Cd "device dpt0"
 .Pp
 For one or more PCI Controllers
-.Cd "controller pci0"
-.Cd "controller dpt0"
+.Cd "device pci0"
+.Cd "device dpt0"
 .Pp
 To allow PCI adapters to use memory mapped I/O if enabled:
 .Cd options DPT_ALLOW_MEMIO
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index c0cdeea..1cff9b1 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -92,7 +92,7 @@
 .Nd Matsushita (Panasonic) CD-ROM driver
 .Sh SYNOPSIS
 .Pp
-.Cd "controller matcd[0-4] at isa? port [?| addr]"
+.Cd "device matcd[0-4] at isa? port [?| addr]"
 .br
 .Cd "/dev/[r]matcd[0-15][a|c]
 .br
@@ -127,13 +127,13 @@ to support and delete the device entries that you don't want.
 
 In this file, you will find an entry like:
 
-	controller  matcd0  at  isa?  port  ?  bio
+	device  matcd0  at  isa?  port  ?  bio
 
 To support two host interfaces, change the file so it reads:
 
-	controller  matcd0  at  isa?  port  ?  bio
+	device  matcd0  at  isa?  port  ?  bio
 .br
-	controller  matcd1  at  isa?  port  ?  bio
+	device  matcd1  at  isa?  port  ?  bio
 .br
 
 (If you want to support up to three or four host interfaces, add
@@ -173,7 +173,7 @@ If you recompile the kernel, you can change the entry in the kernel
 configuration file to specify a specific address by changing an entry
 like this:
 
-	controller  matcd0  at  isa?  port  0x230  bio
+	device  matcd0  at  isa?  port  0x230  bio
 
 With this change, the
 .Nm matcd
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/man4.i386/pcf.4
index b01839d..9fd29c3 100644
--- a/share/man/man4/man4.i386/pcf.4
+++ b/share/man/man4/man4.i386/pcf.4
@@ -32,10 +32,10 @@
 .Nd
 Philips I2C bus controller
 .Sh SYNOPSIS
-.Cd "controller pcf0 at isa? port? irq 5"
+.Cd "device pcf0 at isa? port? irq 5"
 .Pp
 For one or more iicbus busses:
-.Cd "controller iicbus0"
+.Cd "device iicbus0"
 .Sh DESCRIPTION
 The
 .Em pcf
diff --git a/share/man/man4/man4.i386/ppc.4 b/share/man/man4/man4.i386/ppc.4
index e153ad7..e408147 100644
--- a/share/man/man4/man4.i386/ppc.4
+++ b/share/man/man4/man4.i386/ppc.4
@@ -32,10 +32,10 @@
 .Nd
 Parallel port chipset driver
 .Sh SYNOPSIS
-.Cd "controller ppc0 at isa? port? flags 0xXX tty irq 7"
+.Cd "device ppc0 at isa? port? flags 0xXX tty irq 7"
 .Pp
 For one or more PPBUS busses:
-.Cd "controller ppbus at ppc0"
+.Cd "device ppbus at ppc0"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/wd.4 b/share/man/man4/man4.i386/wd.4
index 8d1fe24..0bc8edb 100644
--- a/share/man/man4/man4.i386/wd.4
+++ b/share/man/man4/man4.i386/wd.4
@@ -34,7 +34,7 @@
 .Nd
 Generic WD100x/IDE diskcontroller driver
 .Sh SYNOPSIS
-.Cd "controller wdc0 at isa? port" IO_WD1 irq 14 Op flags Ar flags
+.Cd "device wdc0 at isa? port" IO_WD1 irq 14 Op flags Ar flags
 .Cd "disk wd0 at wdc0 drive 0"
 .Cd "disk wd1 at wdc0 drive 1" Op flags Ar flags
 .Pp
diff --git a/share/man/man4/ppc.4 b/share/man/man4/ppc.4
index e153ad7..e408147 100644
--- a/share/man/man4/ppc.4
+++ b/share/man/man4/ppc.4
@@ -32,10 +32,10 @@
 .Nd
 Parallel port chipset driver
 .Sh SYNOPSIS
-.Cd "controller ppc0 at isa? port? flags 0xXX tty irq 7"
+.Cd "device ppc0 at isa? port? flags 0xXX tty irq 7"
 .Pp
 For one or more PPBUS busses:
-.Cd "controller ppbus at ppc0"
+.Cd "device ppbus at ppc0"
 .Sh DESCRIPTION
 The
 .Nm