diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-22 16:49:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-22 16:49:16 +1000 |
| commit | 31ce7ba74393697f53a69c45de78d17f4b6db6e9 (patch) | |
| tree | 5fdbda128917ab609dd0c117922e500109fae946 /Documentation/hid | |
| parent | 91cd5d7e8dc1129a68e5a8351d52ab428899aa35 (diff) | |
| parent | 221069bed0c73e876e1df1f6cd0140cb353fcd32 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
Diffstat (limited to 'Documentation/hid')
| -rw-r--r-- | Documentation/hid/uhid.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hid/uhid.txt b/Documentation/hid/uhid.txt index ee6593608c8e..54c8f9706a95 100644 --- a/Documentation/hid/uhid.txt +++ b/Documentation/hid/uhid.txt @@ -125,7 +125,7 @@ the request was handled successfully. read() ------ -read() will return a queued ouput report. These output reports can be of type +read() will return a queued output report. These output reports can be of type UHID_START, UHID_STOP, UHID_OPEN, UHID_CLOSE, UHID_OUTPUT or UHID_OUTPUT_EV. No reaction is required to any of them but you should handle them according to your needs. Only UHID_OUTPUT and UHID_OUTPUT_EV have payloads. |