diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-15 16:33:49 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-15 16:33:49 +0000 |
commit | 94056364ad10f7db094464f07d4fa3e65dbd3ece (patch) | |
tree | cddcbb7c9439a2f8aeeee0f9645ed2b8cd805576 /c/src/lib/libbsp | |
parent | 2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-94056364ad10f7db094464f07d4fa3e65dbd3ece.tar.bz2 |
2008-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* network/network.c: Eliminate patterns that look like CVS conflict
markers.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/network/network.c | 4 |
2 files changed, 7 insertions, 2 deletions
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 <joel.sherrill@oarcorp.com> + + * network/network.c: Eliminate patterns that look like CVS conflict + markers. + 2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com> * 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 */ |