Date: Fri, 30 May 2008 04:14:13 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 142559 for review Message-ID: <200805300414.m4U4EDsj056828@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=142559 Change 142559 by jb@freebsd3 on 2008/05/30 04:13:52 IF7 Affected files ... .. //depot/projects/dtrace7/src/sys/net/if_media.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/param.h#9 integrate Differences ... ==== //depot/projects/dtrace7/src/sys/net/if_media.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */ -/* $FreeBSD: src/sys/net/if_media.h,v 1.40.2.1 2008/04/25 16:52:09 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_media.h,v 1.40.2.2 2008/05/27 18:34:20 antoine Exp $ */ /*- * Copyright (c) 1997 @@ -344,7 +344,6 @@ { IFM_1000_LX, "1000baseLX" }, \ { IFM_1000_CX, "1000baseCX" }, \ { IFM_1000_T, "1000baseTX" }, \ - { IFM_1000_T, "1000baseT" }, \ { IFM_HPNA_1, "homePNA" }, \ { IFM_10G_LR, "10Gbase-LR" }, \ { IFM_10G_SR, "10Gbase-SR" }, \ @@ -369,6 +368,7 @@ { IFM_1000_SX, "1000SX" }, \ { IFM_1000_LX, "1000LX" }, \ { IFM_1000_CX, "1000CX" }, \ + { IFM_1000_T, "1000baseT" }, \ { IFM_1000_T, "1000TX" }, \ { IFM_1000_T, "1000T" }, \ { IFM_2500_SX, "2500SX" }, \ ==== //depot/projects/dtrace7/src/sys/sys/param.h#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.308.2.12 2008/05/05 16:44:09 attilio Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.308.2.13 2008/05/27 20:01:04 delphij Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700108 /* Master, propagated to newvers */ +#define __FreeBSD_version 700109 /* Master, propagated to newvers */ #ifndef LOCORE #include <sys/types.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805300414.m4U4EDsj056828>