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 /Documentation/networking/can.txt | |
| 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 'Documentation/networking/can.txt')
| -rw-r--r-- | Documentation/networking/can.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt index 5b04b67ddca2..56ca3b75376e 100644 --- a/Documentation/networking/can.txt +++ b/Documentation/networking/can.txt | |||
| @@ -240,7 +240,7 @@ solution for a couple of reasons: | |||
| 240 | the user application using the common CAN filter mechanisms. Inside | 240 | the user application using the common CAN filter mechanisms. Inside |
| 241 | this filter definition the (interested) type of errors may be | 241 | this filter definition the (interested) type of errors may be |
| 242 | selected. The reception of error frames is disabled by default. | 242 | selected. The reception of error frames is disabled by default. |
| 243 | The format of the CAN error frame is briefly decribed in the Linux | 243 | The format of the CAN error frame is briefly described in the Linux |
| 244 | header file "include/linux/can/error.h". | 244 | header file "include/linux/can/error.h". |
| 245 | 245 | ||
| 246 | 4. How to use Socket CAN | 246 | 4. How to use Socket CAN |