Date: Wed, 7 Jan 2004 16:36:11 -0800 (PST) From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 44928 for review Message-ID: <200401080036.i080aBuO007428@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401080036.i080aBuO007428>