diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index cd326b63934c..552233375ae9 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -194,10 +194,10 @@ device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da0 device ums # Mouse # USB Ethernet -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 701af630658e..930087d51408 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -180,7 +180,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -189,9 +189,9 @@ device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit ethernet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -210,8 +210,8 @@ device fe # Fujitsu MB8696x based cards #device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. # XXX kvtop brokenness, pointer/int warnings #device lnc # NE2100, NE32-VL Lance Ethernet cards -device sn # SMC's 9000 series of ethernet chips -device xe # Xircom pccard ethernet +device sn # SMC's 9000 series of Ethernet chips +device xe # Xircom pccard Ethernet # ISA devices that use the old ISA shims #device le @@ -253,10 +253,10 @@ device ums # Mouse device urio # Diamond Rio 500 MP3 player device uscanner # Scanners # USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 1d4412d72e40..b00cf9aface6 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -194,7 +194,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -203,9 +203,9 @@ device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit ethernet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -221,8 +221,8 @@ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. device lnc # NE2100, NE32-VL Lance Ethernet cards -device sn # SMC's 9000 series of ethernet chips -device xe # Xircom pccard ethernet +device sn # SMC's 9000 series of Ethernet chips +device xe # Xircom pccard Ethernet # ISA devices that use the old ISA shims #device le @@ -264,11 +264,11 @@ device ums # Mouse device urio # Diamond Rio 500 MP3 player device uscanner # Scanners # USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet -device rue # RealTek RTL8150 USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet +device rue # RealTek RTL8150 USB Ethernet # FireWire support device firewire # FireWire bus code diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 02a8f1330977..900623719511 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -55,7 +55,7 @@ options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions # Various "busses" device acpi # ACPI support (mandatory) device firewire # FireWire bus code -device miibus # MII bus support (ethernet) +device miibus # MII bus support (Ethernet) device pci # PCI bus support device scbus # SCSI bus (required for SCSI) device usb # USB Bus (required for USB) @@ -123,9 +123,9 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device xl # 3Com 3c90x ("Boomerang", "Cyclone") # USB Ethernet -device aue # ADMtek USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device sbp # SCSI over FireWire (need scbus & da) diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 0d6024a579b4..f8097f104a6d 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -175,7 +175,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -184,9 +184,9 @@ device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit ethernet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -199,9 +199,9 @@ device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device lnc # C-NET(98)S -device sn # SMC's 9000 series of ethernet chips +device sn # SMC's 9000 series of Ethernet chips device snc -device xe # Xircom pccard ethernet +device xe # Xircom pccard Ethernet # Wireless NIC cards device wlan # 802.11 support @@ -240,11 +240,11 @@ device bpf # Berkeley packet filter #device urio # Diamond Rio 500 MP3 player #device uscanner # Scanners # USB Ethernet, requires mii -#device aue # ADMtek USB ethernet -#device axe # ASIX Electronics USB ethernet -#device cue # CATC USB ethernet -#device kue # Kawasaki LSI USB ethernet -#device rue # RealTek RTL8150 USB ethernet +#device aue # ADMtek USB Ethernet +#device axe # ASIX Electronics USB Ethernet +#device cue # CATC USB Ethernet +#device kue # Kawasaki LSI USB Ethernet +#device rue # RealTek RTL8150 USB Ethernet # FireWire support #device firewire # FireWire bus code diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index a667c34a85cf..495ac9db84a8 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -127,10 +127,10 @@ device ums # Mouse device urio # Diamond Rio 500 MP3 player device uscanner # Scanners # USB Ethernet -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 4154497cf1e2..3ff34ca23a86 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -195,10 +195,10 @@ device bpf #Berkeley packet filter #device umass # Disks/Mass storage - Requires scbus and da0 #device ums # Mouse # USB Ethernet -#device aue # ADMtek USB ethernet -#device axe # ASIX Electronics USB ethernet -#device cue # CATC USB ethernet -#device kue # Kawasaki LSI USB ethernet +#device aue # ADMtek USB Ethernet +#device axe # ASIX Electronics USB Ethernet +#device cue # CATC USB Ethernet +#device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code