From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 16:36:13 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DD96D16A4D1; Wed,  7 Jan 2004 16:36:12 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B79A616A4CE
	for <perforce@freebsd.org>; Wed,  7 Jan 2004 16:36:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0324F43D48
	for <perforce@freebsd.org>; Wed,  7 Jan 2004 16:36:12 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i080aB0B007431
	for <perforce@freebsd.org>; Wed, 7 Jan 2004 16:36:11 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i080aBuO007428
	for perforce@freebsd.org; Wed, 7 Jan 2004 16:36:11 -0800 (PST)
	(envelope-from imp@freebsd.org)
Date: Wed, 7 Jan 2004 16:36:11 -0800 (PST)
Message-Id: <200401080036.i080aBuO007428@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44928 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 00:36:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=44928

Change 44928 by imp@imp_pacopaco on 2004/01/07 16:35:53

	fix mismerge botch

Affected files ...

.. //depot/projects/power/sys/pci/if_ste.c#5 edit
.. //depot/user/imp/newcard/pci/if_ste.c#27 edit

Differences ...

==== //depot/projects/power/sys/pci/if_ste.c#5 (text+ko) ====

@@ -923,7 +923,7 @@
 
 	mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
-#ifndef BURN_BRIDGES
+
 	/*
 	 * Only use one PHY since this chip reports multiple
 	 * Note on the DFE-550 the PHY is at 1 on the DFE-580

==== //depot/user/imp/newcard/pci/if_ste.c#27 (text+ko) ====