PERFORCE change 44928 for review

[Warner Losh]

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

Change 44928 by imp at 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) ====