diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 01:34:59 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 01:34:59 -0500 |
| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 /Documentation/DocBook | |
| parent | 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 (diff) | |
| parent | a6d38f889750ed6290728a19d9dad577b147c6d0 (diff) | |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index 22edcbb9dda..35447e08173 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl | |||
| @@ -304,6 +304,10 @@ X!Idrivers/video/console/fonts.c | |||
| 304 | !Edrivers/input/ff-core.c | 304 | !Edrivers/input/ff-core.c |
| 305 | !Edrivers/input/ff-memless.c | 305 | !Edrivers/input/ff-memless.c |
| 306 | </sect1> | 306 | </sect1> |
| 307 | <sect1><title>Multitouch Library</title> | ||
| 308 | !Iinclude/linux/input/mt.h | ||
| 309 | !Edrivers/input/input-mt.c | ||
| 310 | </sect1> | ||
| 307 | <sect1><title>Polled input devices</title> | 311 | <sect1><title>Polled input devices</title> |
| 308 | !Iinclude/linux/input-polldev.h | 312 | !Iinclude/linux/input-polldev.h |
| 309 | !Edrivers/input/input-polldev.c | 313 | !Edrivers/input/input-polldev.c |