aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/drbd.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
committerJames Morris <jmorris@namei.org>2011-04-19 07:32:41 -0400
commitd4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch)
treeeefd82c155bc27469a85667d759cd90facf4a6e3 /include/linux/drbd.h
parentc0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff)
parent96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff)
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'include/linux/drbd.h')
-rw-r--r--include/linux/drbd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index d18d673ebc78..cec467f5d676 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -36,7 +36,7 @@
36#include <sys/wait.h> 36#include <sys/wait.h>
37#include <limits.h> 37#include <limits.h>
38 38
39/* Altough the Linux source code makes a difference between 39/* Although the Linux source code makes a difference between
40 generic endianness and the bitfields' endianness, there is no 40 generic endianness and the bitfields' endianness, there is no
41 architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness 41 architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness
42 does not match the generic endianness. */ 42 does not match the generic endianness. */
@@ -184,7 +184,7 @@ enum drbd_conns {
184 /* These temporal states are all used on the way 184 /* These temporal states are all used on the way
185 * from >= C_CONNECTED to Unconnected. 185 * from >= C_CONNECTED to Unconnected.
186 * The 'disconnect reason' states 186 * The 'disconnect reason' states
187 * I do not allow to change beween them. */ 187 * I do not allow to change between them. */
188 C_TIMEOUT, 188 C_TIMEOUT,
189 C_BROKEN_PIPE, 189 C_BROKEN_PIPE,
190 C_NETWORK_FAILURE, 190 C_NETWORK_FAILURE,