From 94056364ad10f7db094464f07d4fa3e65dbd3ece Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 15 May 2008 16:33:49 +0000 Subject: 2008-05-15 Joel Sherrill * network/network.c: Eliminate patterns that look like CVS conflict markers. --- c/src/lib/libbsp/i386/i386ex/ChangeLog | 5 +++++ c/src/lib/libbsp/i386/i386ex/network/network.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp/i386/i386ex') diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 2c9c8657fd..3f50561016 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,8 @@ +2008-05-15 Joel Sherrill + + * network/network.c: Eliminate patterns that look like CVS conflict + markers. + 2008-05-15 Joel Sherrill * startup/bspstart.c: Add capability for bootcard.c BSP Initialization diff --git a/c/src/lib/libbsp/i386/i386ex/network/network.c b/c/src/lib/libbsp/i386/i386ex/network/network.c index ba6b6156f1..de3e43de62 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/network.c +++ b/c/src/lib/libbsp/i386/i386ex/network/network.c @@ -962,11 +962,11 @@ void uti596reset(void) /* abort ALL of the current work */ /* FEB 17 REMOVED - >>>>> + ====> sc->scb.command = CUC_ABORT | RX_ABORT; outport_word(CHAN_ATTN,0); UTI_WAIT_COMMAND_ACCEPTED(4000, "reset: abort requested"); - <<<<< + <==== */ uti596_reset_hardware(&uti596_softc); /* reset the ethernet hardware. must re-config */ -- cgit v1.2.3