From a6d5c064b247ab378ef56ec8005f4306f83d77ce Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 26 Dec 2007 14:29:30 +0000 Subject: [PATCH] Adjust various manpages/files for the new msk(4) driver. --- share/man/man4/miibus.4 | 5 ++++- share/man/man4/vlan.4 | 3 ++- sys/boot/forth/loader-bootp.conf | 3 ++- sys/boot/forth/loader.conf | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4 index a6f02a5cd7..b6eddd8c7e 100644 --- a/share/man/man4/miibus.4 +++ b/share/man/man4/miibus.4 @@ -7,7 +7,7 @@ .\" I doubt you would ever notice due to large differences. .\" .\" $FreeBSD: src/share/man/man4/miibus.4,v 1.3.2.6 2004/03/01 09:22:11 brueffer Exp $ -.\" $DragonFly: src/share/man/man4/miibus.4,v 1.14 2007/10/12 14:12:42 sephe Exp $ +.\" $DragonFly: src/share/man/man4/miibus.4,v 1.15 2007/12/26 14:29:30 swildner Exp $ .\" .Dd February 15, 2003 .Dt MIIBUS 4 @@ -70,6 +70,8 @@ Intel EtherExpress PRO/100B Intel Pro/1000 82542/82543 Gigabit Ethernet .It Xr lge 4 Level 1 LXT1001 NetCellerator Gigabit Ethernet +.It Xr msk 4 +Marvell/SysKonnect Yukon II Gigabit Ethernet .It Xr nfe 4 NVIDIA nForce MCP 10/100/Gigabit Ethernet .It Xr nge 4 @@ -127,6 +129,7 @@ but as a result are not well behaved newbus device drivers. .Xr fxp 4 , .Xr gx 4 , .Xr lge 4 , +.Xr msk 4 , .Xr netintro 4 , .Xr nfe 4 , .Xr nge 4 , diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4 index 0792aef080..154b678570 100644 --- a/share/man/man4/vlan.4 +++ b/share/man/man4/vlan.4 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/vlan.4,v 1.1.2.6 2002/08/30 11:53:56 yar Exp $ -.\" $DragonFly: src/share/man/man4/vlan.4,v 1.8 2007/10/17 12:48:23 sephe Exp $ +.\" $DragonFly: src/share/man/man4/vlan.4,v 1.9 2007/12/26 14:29:30 swildner Exp $ .\" .Dd July 25, 2001 .Dt VLAN 4 @@ -97,6 +97,7 @@ are .Xr bge 4 , .Xr em 4 , .Xr gx 4 , +.Xr msk 4 , .Xr nge 4 , .Xr re 4 , .Xr stge 4 , diff --git a/sys/boot/forth/loader-bootp.conf b/sys/boot/forth/loader-bootp.conf index 879c1eff83..c70dffbd9c 100644 --- a/sys/boot/forth/loader-bootp.conf +++ b/sys/boot/forth/loader-bootp.conf @@ -7,7 +7,7 @@ # All arguments must be in double quotes. # # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $ -# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.17 2007/11/19 18:49:06 swildner Exp $ +# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.18 2007/12/26 14:29:30 swildner Exp $ ############################################################## ### Basic configuration options ############################ @@ -199,6 +199,7 @@ if_ipw_load="NO" # Intel(R) PRO/Wireless 2100 MiniPCI if_iwi_load="NO" # Intel(R) PRO/Wireless 2200BG/2915ABG MiniPCI if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI gigabit ethernet if_lnc_load="NO" # AMD Lance/PCnet Ethernet +if_msk_load="NO" # Marvell/SysKonnect Yukon II Gigabit Ethernet if_my_load="NO" # Myson PCI fast ethernet #if_ndis_load="NO" # NDIS miniport driver wrapper if_nfe_load="NO" # NVIDIA nForce MCP 10/100/Gigabit ethernet diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 833ddf3caf..2edb8ef8d4 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -7,7 +7,7 @@ # All arguments must be in double quotes. # # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $ -# $DragonFly: src/sys/boot/forth/loader.conf,v 1.24 2007/11/19 18:49:06 swildner Exp $ +# $DragonFly: src/sys/boot/forth/loader.conf,v 1.25 2007/12/26 14:29:30 swildner Exp $ ############################################################## ### Basic configuration options ############################ @@ -195,6 +195,7 @@ if_ipw_load="NO" # Intel(R) PRO/Wireless 2100 MiniPCI if_iwi_load="NO" # Intel(R) PRO/Wireless 2200BG/2915ABG MiniPCI if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI gigabit ethernet if_lnc_load="NO" # AMD Lance/PCnet Ethernet +if_msk_load="NO" # Marvell/SysKonnect Yukon II Gigabit Ethernet if_my_load="NO" # Myson PCI fast ethernet #if_ndis_load="NO" # NDIS miniport driver wrapper if_nfe_load="NO" # NVIDIA nForce MCP 10/100/Gigabit ethernet -- 2.41.0