diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /include/linux/drbd.h | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'include/linux/drbd.h')
-rw-r--r-- | include/linux/drbd.h | 4 |
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, |