From 198d12938f1c939ec76d10561f1b5b38fbf78bf2 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Mon, 21 Feb 2005 18:40:37 +0000 Subject: [PATCH] Remove some duplicate FreeBSD CVS IDs, move some IDs to better places. Submitted-by: Sarunas Vancevicius --- sys/dev/netif/an/if_an.c | 4 +--- sys/dev/netif/an/if_an_isa.c | 4 +--- sys/dev/netif/an/if_an_pccard.c | 4 +--- sys/dev/netif/an/if_an_pci.c | 4 +--- sys/dev/netif/aue/if_aue.c | 4 +--- sys/dev/netif/cs/if_cs.c | 5 ++--- sys/dev/netif/cs/if_csreg.h | 5 +---- sys/dev/netif/cue/if_cue.c | 3 +-- sys/dev/netif/dc/if_dc.c | 4 +--- sys/dev/netif/fe/if_fereg.h | 6 +++--- sys/dev/netif/fpa/if_fpa.c | 3 +-- sys/dev/netif/gx/if_gxreg.h | 4 ++-- sys/dev/netif/gx/if_gxvar.h | 4 ++-- sys/dev/netif/kue/if_kue.c | 4 ++-- sys/dev/netif/mii_layer/amphy.c | 4 +--- sys/dev/netif/mii_layer/brgphy.c | 4 +--- sys/dev/netif/mii_layer/nsgphy.c | 4 +--- sys/dev/netif/mii_layer/pnaphy.c | 4 +--- sys/dev/netif/mii_layer/pnphy.c | 4 +--- sys/dev/netif/mii_layer/rlphy.c | 4 +--- sys/dev/netif/mii_layer/xmphy.c | 4 +--- sys/dev/netif/nge/if_nge.c | 4 +--- sys/dev/netif/pcn/if_pcn.c | 4 +--- sys/dev/netif/rl/if_rl.c | 4 +--- sys/dev/netif/sf/if_sf.c | 4 +--- sys/dev/netif/sis/if_sis.c | 4 +--- sys/dev/netif/sk/if_sk.c | 4 +--- sys/dev/netif/ste/if_ste.c | 4 +--- sys/dev/netif/ti/if_ti.c | 4 +--- sys/dev/netif/tl/if_tl.c | 4 +--- sys/dev/netif/txp/if_txp.c | 4 +--- sys/dev/netif/vr/if_vr.c | 4 +--- sys/dev/netif/wb/if_wb.c | 4 +--- 33 files changed, 39 insertions(+), 95 deletions(-) diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c index e74abd87b3..f9ccdebb53 100644 --- a/sys/dev/netif/an/if_an.c +++ b/sys/dev/netif/an/if_an.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.17 2005/02/15 08:29:02 joerg Exp $ - * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.18 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/an/if_an_isa.c b/sys/dev/netif/an/if_an_isa.c index 65c5fcf831..9e77369fcf 100644 --- a/sys/dev/netif/an/if_an_isa.c +++ b/sys/dev/netif/an/if_an_isa.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.5 2003/02/01 03:25:12 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.5 2004/03/14 15:36:48 joerg Exp $ - * - * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.5 2003/02/01 03:25:12 ambrisko Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/an/if_an_pccard.c b/sys/dev/netif/an/if_an_pccard.c index def1d2963f..073c160ed8 100644 --- a/sys/dev/netif/an/if_an_pccard.c +++ b/sys/dev/netif/an/if_an_pccard.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.6 2003/02/01 03:25:12 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.5 2004/03/14 15:36:48 joerg Exp $ - * - * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.6 2003/02/01 03:25:12 ambrisko Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/an/if_an_pci.c b/sys/dev/netif/an/if_an_pci.c index 57a9d934bb..f1856d6082 100644 --- a/sys/dev/netif/an/if_an_pci.c +++ b/sys/dev/netif/an/if_an_pci.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.8 2003/02/11 03:32:48 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.5 2004/03/14 15:36:48 joerg Exp $ - * - * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.8 2003/02/11 03:32:48 ambrisko Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c index b14eeddfb4..cac8e5f2ae 100644 --- a/sys/dev/netif/aue/if_aue.c +++ b/sys/dev/netif/aue/if_aue.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $ - * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.17 2005/02/16 22:50:28 joerg Exp $ - * - * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $ + * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.18 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c index a0b2cbfb47..629bf0c0da 100644 --- a/sys/dev/netif/cs/if_cs.c +++ b/sys/dev/netif/cs/if_cs.c @@ -24,12 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.14 2005/02/21 18:40:36 joerg Exp $ */ /* - * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.13 2005/02/15 20:09:13 joerg Exp $ - * * Device driver for Crystal Semiconductor CS8920 based ethernet * adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997 */ diff --git a/sys/dev/netif/cs/if_csreg.h b/sys/dev/netif/cs/if_csreg.h index 0f8f70f530..471621f0d5 100644 --- a/sys/dev/netif/cs/if_csreg.h +++ b/sys/dev/netif/cs/if_csreg.h @@ -24,11 +24,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - */ - -/* * $FreeBSD: src/sys/dev/cs/if_csreg.h,v 1.3.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_csreg.h,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_csreg.h,v 1.3 2005/02/21 18:40:36 joerg Exp $ */ #define CS_89x0_IO_PORTS 0x0020 diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c index b50cd55834..d48ee7a2a0 100644 --- a/sys/dev/netif/cue/if_cue.c +++ b/sys/dev/netif/cue/if_cue.c @@ -30,8 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $ - * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.17 2005/02/16 22:50:28 joerg Exp $ - * + * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.18 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index 450048511c..bfcc09a525 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.22 2005/02/20 04:29:28 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.23 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/fe/if_fereg.h b/sys/dev/netif/fe/if_fereg.h index 1b2a752566..6ed2584eee 100644 --- a/sys/dev/netif/fe/if_fereg.h +++ b/sys/dev/netif/fe/if_fereg.h @@ -22,11 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/fe/if_fereg.h,v 1.8.2.1 2000/09/22 10:01:47 nyan Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fereg.h,v 1.3 2005/02/21 18:40:36 joerg Exp $ */ -/* $FreeBSD: src/sys/dev/fe/if_fereg.h,v 1.8.2.1 2000/09/22 10:01:47 nyan Exp $ */ -/* $DragonFly: src/sys/dev/netif/fe/if_fereg.h,v 1.2 2003/06/17 04:28:25 dillon Exp $ */ - /* * Registers on FMV-180 series' ISA bus interface ASIC. * I'm not sure the following register names are appropriate. diff --git a/sys/dev/netif/fpa/if_fpa.c b/sys/dev/netif/fpa/if_fpa.c index a6a4b6e1ad..a01db9ed90 100644 --- a/sys/dev/netif/fpa/if_fpa.c +++ b/sys/dev/netif/fpa/if_fpa.c @@ -22,8 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.13 1999/08/28 00:50:50 peter Exp $ - * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.8 2004/04/07 05:45:28 dillon Exp $ - * + * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.9 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/gx/if_gxreg.h b/sys/dev/netif/gx/if_gxreg.h index 2db94ff7a0..a045ec5f6b 100644 --- a/sys/dev/netif/gx/if_gxreg.h +++ b/sys/dev/netif/gx/if_gxreg.h @@ -26,8 +26,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/gx/if_gxreg.h,v 1.1.2.1 2001/11/15 03:09:23 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gxreg.h,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * $FreeBSD: src/sys/dev/gx/if_gxreg.h,v 1.1.2.1 2001/11/15 03:09:23 jlemon Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gxreg.h,v 1.3 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/gx/if_gxvar.h b/sys/dev/netif/gx/if_gxvar.h index 3c45e9ca46..694b929bf4 100644 --- a/sys/dev/netif/gx/if_gxvar.h +++ b/sys/dev/netif/gx/if_gxvar.h @@ -26,8 +26,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/gx/if_gxvar.h,v 1.1.2.1 2001/11/15 03:09:23 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gxvar.h,v 1.3 2004/02/13 02:44:48 joerg Exp $ + * $FreeBSD: src/sys/dev/gx/if_gxvar.h,v 1.1.2.1 2001/11/15 03:09:23 jlemon Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gxvar.h,v 1.4 2005/02/21 18:40:36 joerg Exp $ */ #if defined(__DragonFly__) || __FreeBSD_version < 500000 diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c index 7d7d96c31b..631c780047 100644 --- a/sys/dev/netif/kue/if_kue.c +++ b/sys/dev/netif/kue/if_kue.c @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $ - * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.14 2005/02/16 22:50:28 joerg Exp $ + * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $ + * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.15 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/amphy.c b/sys/dev/netif/mii_layer/amphy.c index c5851ad8a7..c4c89f0556 100644 --- a/sys/dev/netif/mii_layer/amphy.c +++ b/sys/dev/netif/mii_layer/amphy.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.2.2.2 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/amphy.c,v 1.5 2004/09/18 19:32:59 dillon Exp $ - * - * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.2.2.2 2002/11/08 21:53:49 semenu Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/amphy.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/brgphy.c b/sys/dev/netif/mii_layer/brgphy.c index 157c3a5ca0..d8ca800480 100644 --- a/sys/dev/netif/mii_layer/brgphy.c +++ b/sys/dev/netif/mii_layer/brgphy.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.7 2003/05/11 18:00:55 ps Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.6 2005/02/14 16:21:34 joerg Exp $ - * - * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.7 2003/05/11 18:00:55 ps Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.7 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/nsgphy.c b/sys/dev/netif/mii_layer/nsgphy.c index e286317aa7..f29c96e860 100644 --- a/sys/dev/netif/mii_layer/nsgphy.c +++ b/sys/dev/netif/mii_layer/nsgphy.c @@ -31,9 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/nsgphy.c,v 1.6 2005/02/14 16:21:34 joerg Exp $ - * - * $FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/nsgphy.c,v 1.7 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/pnaphy.c b/sys/dev/netif/mii_layer/pnaphy.c index 77318f4c1a..ffd7ca3145 100644 --- a/sys/dev/netif/mii_layer/pnaphy.c +++ b/sys/dev/netif/mii_layer/pnaphy.c @@ -31,9 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/pnaphy.c,v 1.6 2005/02/14 16:21:34 joerg Exp $ - * - * $FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/pnaphy.c,v 1.7 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/pnphy.c b/sys/dev/netif/mii_layer/pnphy.c index d5699053cb..884677d9b7 100644 --- a/sys/dev/netif/mii_layer/pnphy.c +++ b/sys/dev/netif/mii_layer/pnphy.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1.2.1 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/pnphy.c,v 1.5 2004/09/18 19:32:59 dillon Exp $ - * - * $FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1.2.1 2002/11/08 21:53:49 semenu Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/pnphy.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/rlphy.c b/sys/dev/netif/mii_layer/rlphy.c index a8b442f741..74607e897f 100644 --- a/sys/dev/netif/mii_layer/rlphy.c +++ b/sys/dev/netif/mii_layer/rlphy.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2.2.4 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/rlphy.c,v 1.5 2004/09/18 19:32:59 dillon Exp $ - * - * $FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2.2.4 2002/11/08 21:53:49 semenu Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/rlphy.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/mii_layer/xmphy.c b/sys/dev/netif/mii_layer/xmphy.c index 8243af6ff9..93387fa169 100644 --- a/sys/dev/netif/mii_layer/xmphy.c +++ b/sys/dev/netif/mii_layer/xmphy.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/xmphy.c,v 1.1.2.5 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/xmphy.c,v 1.5 2004/09/18 19:32:59 dillon Exp $ - * - * $FreeBSD: src/sys/dev/mii/xmphy.c,v 1.1.2.5 2002/11/08 21:53:49 semenu Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/xmphy.c,v 1.6 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index f0325a999e..b8bed73b7c 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -31,9 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.18 2005/02/19 01:07:24 joerg Exp $ - * - * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ + * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.19 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c index 03341e570a..6ad1ee0db1 100644 --- a/sys/dev/netif/pcn/if_pcn.c +++ b/sys/dev/netif/pcn/if_pcn.c @@ -31,9 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.16 2005/02/19 01:16:46 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ + * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.17 2005/02/21 18:40:36 joerg Exp $ */ /* diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 75ee7ec036..1535c9793c 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.17 2005/02/12 04:00:13 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.18 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c index 5b687112be..d37f319356 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.15 2005/02/20 05:44:34 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.16 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index c55f83882b..ec7c39e6be 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.19 2005/02/14 17:38:30 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ + * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.20 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index a9e2f41acc..e9099799b2 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -32,9 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.25 2005/02/20 01:49:21 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ + * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.26 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index f90605e0e9..2867b0d24a 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.15 2005/02/20 02:59:57 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ + * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.16 2005/02/21 18:40:37 joerg Exp $ */ #include diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index 1fe2a4d2e9..bf4ff58348 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.17 2005/02/20 05:45:38 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ + * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.18 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index 75d725f0b6..4a491ccf70 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ - * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.15 2005/02/20 03:04:51 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ + * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.16 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c index 3dc9d58257..2fdb6d1de9 100644 --- a/sys/dev/netif/txp/if_txp.c +++ b/sys/dev/netif/txp/if_txp.c @@ -1,6 +1,6 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ /* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */ -/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.16 2005/02/20 03:11:53 joerg Exp $ */ +/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.17 2005/02/21 18:40:37 joerg Exp $ */ /* * Copyright (c) 2001 @@ -34,8 +34,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */ /* diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index 413804f473..9226909cb7 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.18 2005/02/20 03:21:58 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ + * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.19 2005/02/21 18:40:37 joerg Exp $ */ /* diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index a26ea71ed1..be50a583af 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -30,9 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.16 2005/02/20 03:55:14 joerg Exp $ - * - * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ + * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.17 2005/02/21 18:40:37 joerg Exp $ */ /* -- 2.41.0