summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/sys/extent.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/sys/extent.h b/sys/sys/extent.h
index 7880117d30a..5bacde20e01 100644
--- a/sys/sys/extent.h
+++ b/sys/sys/extent.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extent.h,v 1.10 2009/04/10 20:57:04 kettenis Exp $ */
+/* $OpenBSD: extent.h,v 1.11 2009/04/19 11:04:11 kettenis Exp $ */
/* $NetBSD: extent.h,v 1.6 1997/10/09 07:43:05 jtc Exp $ */
/*-
@@ -82,7 +82,7 @@ struct extent_fixed {
#define EX_MALLOCOK 0x10 /* safe to call malloc() */
#define EX_WAITSPACE 0x20 /* wait for space to become free */
#define EX_BOUNDZERO 0x40 /* boundary lines start at 0 */
-#define EX_CONFLICTOK 0x80 /* allow conlficts */
+#define EX_CONFLICTOK 0x80 /* allow conflicts */
/*
* Special place holders for "alignment" and "boundary" arguments,