diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/DocBook/usb.tmpl | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 |