diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/infiniband/hw/amso1100/c2_wr.h | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/infiniband/hw/amso1100/c2_wr.h')
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_wr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2_wr.h b/drivers/infiniband/hw/amso1100/c2_wr.h index c65fbdd6e469..8d4b4ca463ca 100644 --- a/drivers/infiniband/hw/amso1100/c2_wr.h +++ b/drivers/infiniband/hw/amso1100/c2_wr.h | |||
@@ -131,7 +131,7 @@ enum c2wr_ids { | |||
131 | * All the preceding IDs are fixed, and must not change. | 131 | * All the preceding IDs are fixed, and must not change. |
132 | * You can add new IDs, but must not remove or reorder | 132 | * You can add new IDs, but must not remove or reorder |
133 | * any IDs. If you do, YOU will ruin any hope of | 133 | * any IDs. If you do, YOU will ruin any hope of |
134 | * compatability between versions. | 134 | * compatibility between versions. |
135 | */ | 135 | */ |
136 | CCWR_LAST, | 136 | CCWR_LAST, |
137 | 137 | ||
@@ -242,7 +242,7 @@ enum c2_acf { | |||
242 | /* | 242 | /* |
243 | * to fix bug 1815 we define the max size allowable of the | 243 | * to fix bug 1815 we define the max size allowable of the |
244 | * terminate message (per the IETF spec).Refer to the IETF | 244 | * terminate message (per the IETF spec).Refer to the IETF |
245 | * protocal specification, section 12.1.6, page 64) | 245 | * protocol specification, section 12.1.6, page 64) |
246 | * The message is prefixed by 20 types of DDP info. | 246 | * The message is prefixed by 20 types of DDP info. |
247 | * | 247 | * |
248 | * Then the message has 6 bytes for the terminate control | 248 | * Then the message has 6 bytes for the terminate control |