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/DocBook/usb.tmpl | |
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/DocBook/usb.tmpl')
-rw-r--r-- | Documentation/DocBook/usb.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl index af293606fbe3..8d57c1888dca 100644 --- a/Documentation/DocBook/usb.tmpl +++ b/Documentation/DocBook/usb.tmpl | |||
@@ -690,7 +690,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param) | |||
690 | </para><para> | 690 | </para><para> |
691 | This request lets kernel drivers talk to user mode code | 691 | This request lets kernel drivers talk to user mode code |
692 | through filesystem operations even when they don't create | 692 | through filesystem operations even when they don't create |
693 | a charactor or block special device. | 693 | a character or block special device. |
694 | It's also been used to do things like ask devices what | 694 | It's also been used to do things like ask devices what |
695 | device special file should be used. | 695 | device special file should be used. |
696 | Two pre-defined ioctls are used | 696 | Two pre-defined ioctls are used |