diff options
Diffstat (limited to 'share/man/man4/man4.amiga/ahsc.4')
| -rw-r--r-- | share/man/man4/man4.amiga/ahsc.4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/share/man/man4/man4.amiga/ahsc.4 b/share/man/man4/man4.amiga/ahsc.4 index b52bf0b3f31..c7d5308702c 100644 --- a/share/man/man4/man4.amiga/ahsc.4 +++ b/share/man/man4/man4.amiga/ahsc.4 @@ -27,11 +27,11 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: ahsc.4,v 1.3 1998/09/01 16:38:20 deraadt Exp $ +.\" $Id: ahsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $ .\" .Dd August 31, 1994 -.Os .Dt AHSC 4 amiga +.Os .Sh NAME .Nm ahsc .Nd A3000 low level SCSI interface @@ -69,7 +69,11 @@ withing the SCSI chip. .It ahsc%d: abort %s: csr = 0x%02x, asr = 0x%02x A SCSI operation %s was aborted due to an error. .It ahsc%d: csr == 0x%02i +<<<<<<< ahsc.4 +A error has occurred within the SCSI chip code. +======= An error has occurred within the SCSI chip code. +>>>>>>> 1.3 .It ahsc%d: unexpected phase %d in icmd from %d The target described by .Sq from %d |