diff options
| author | cegger <cegger@NetBSD.org> | 2010-08-29 21:14:16 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2010-08-29 21:14:16 +0000 |
| commit | 6bb3ec6d99dfabc6d0347bb3f2ab553d643cf18d (patch) | |
| tree | 1107b9e9bf2e7fc490a8fffb176d875c5465da29 /sys | |
| parent | 72a98abb7efd020a2bb58d3a0b13a5ca92d4783e (diff) | |
Confilict -> Conflict
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ieee1394/sbp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ieee1394/sbp.h b/sys/dev/ieee1394/sbp.h index 7853fd3794c..4b4a7126f39 100644 --- a/sys/dev/ieee1394/sbp.h +++ b/sys/dev/ieee1394/sbp.h @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.h,v 1.5 2010/04/29 06:51:26 kiyohara Exp $ */ +/* $NetBSD: sbp.h,v 1.6 2010/08/29 21:14:16 cegger Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -147,7 +147,7 @@ struct sbp_status{ /* 6: Busy retry limit exceeded: ack_busy_B */ /* 7-A: Reserved for future standardization */ /* B: Tardy retry limit exceeded */ -/* C: Confilict error */ +/* C: Conflict error */ /* D: Data error */ /* E: Type error */ /* F: Address error */ |
