[src/trunk]: src/sys/dev/ieee1394 Confilict -> Conflict

[cegger <cegger%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/22df46f14085
branches:  trunk
changeset: 757439:22df46f14085
user:      cegger <cegger%NetBSD.org@localhost>
date:      Sun Aug 29 21:14:16 2010 +0000

description:
Confilict -> Conflict

diffstat:

 sys/dev/ieee1394/sbp.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 0b905c6a5643 -r 22df46f14085 sys/dev/ieee1394/sbp.h
--- a/sys/dev/ieee1394/sbp.h    Sun Aug 29 18:55:50 2010 +0000
+++ b/sys/dev/ieee1394/sbp.h    Sun Aug 29 21:14:16 2010 +0000
@@ -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 */