diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /Documentation/input | |
| parent | 3d95fd6ad8d3cf582a70ed65660017114b6e4065 (diff) | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'Documentation/input')
| -rw-r--r-- | Documentation/input/input.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index b93c08442e3c..b3d6787b4fb1 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt | |||
| @@ -111,7 +111,7 @@ LCDs and many other purposes. | |||
| 111 | 111 | ||
| 112 | The monitor and speaker controls should be easy to add to the hid/input | 112 | The monitor and speaker controls should be easy to add to the hid/input |
| 113 | interface, but for the UPSs and LCDs it doesn't make much sense. For this, | 113 | interface, but for the UPSs and LCDs it doesn't make much sense. For this, |
| 114 | the hiddev interface was designed. See Documentation/usb/hiddev.txt | 114 | the hiddev interface was designed. See Documentation/hid/hiddev.txt |
| 115 | for more information about it. | 115 | for more information about it. |
| 116 | 116 | ||
| 117 | The usage of the usbhid module is very simple, it takes no parameters, | 117 | The usage of the usbhid module is very simple, it takes no parameters, |