Module Name: src
Committed By: cegger
Date: Sun Aug 29 21:14:16 UTC 2010
Modified Files:
src/sys/dev/ieee1394: sbp.h
Log Message:
Confilict -> Conflict
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ieee1394/sbp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/sbp.h
diff -u src/sys/dev/ieee1394/sbp.h:1.5 src/sys/dev/ieee1394/sbp.h:1.6
--- src/sys/dev/ieee1394/sbp.h:1.5 Thu Apr 29 06:51:26 2010
+++ src/sys/dev/ieee1394/sbp.h Sun Aug 29 21:14:16 2010
@@ -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 @@
/* 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 */
