aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-17 01:12:20 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-20 03:52:09 -0500
commitd69249f4b6857c0b23ceca270ae591381b16bba9 (patch)
treea611408198c25bf2d38d5de5f985810ec4db5924
parentdad725d089b94bce8bbc769b7471dcfba3fbda0e (diff)
Input: input-polldev, matrix-keypad - include in kernel doc
Make sure that polled input device and matrix keypad APIs are included with the rest of input API when generating kernel documentation. Also description of absres was missing as well. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--Documentation/DocBook/device-drivers.tmpl9
-rw-r--r--include/linux/input.h1
-rw-r--r--include/linux/input/matrix_keypad.h3
3 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 94a20fe8fedf..e994d1d9fbe6 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -293,10 +293,19 @@ X!Idrivers/video/console/fonts.c
293 293
294 <chapter id="input_subsystem"> 294 <chapter id="input_subsystem">
295 <title>Input Subsystem</title> 295 <title>Input Subsystem</title>
296 <sect1><title>Input core</title>
296!Iinclude/linux/input.h 297!Iinclude/linux/input.h
297!Edrivers/input/input.c 298!Edrivers/input/input.c
298!Edrivers/input/ff-core.c 299!Edrivers/input/ff-core.c
299!Edrivers/input/ff-memless.c 300!Edrivers/input/ff-memless.c
301 </sect1>
302 <sect1><title>Polled input devices</title>
303!Iinclude/linux/input-polldev.h
304!Edrivers/input/input-polldev.c
305 </sect1>
306 <sect1><title>Matrix keyboars/keypads</title>
307!Iinclude/linux/input/matrix_keypad.h
308 </sect1>
300 </chapter> 309 </chapter>
301 310
302 <chapter id="spi"> 311 <chapter id="spi">
diff --git a/include/linux/input.h b/include/linux/input.h
index 9a04e26daab2..56d8e048c646 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1040,6 +1040,7 @@ struct ff_effect {
1040 * @absmin: minimum values for events coming from absolute axes 1040 * @absmin: minimum values for events coming from absolute axes
1041 * @absfuzz: describes noisiness for axes 1041 * @absfuzz: describes noisiness for axes
1042 * @absflat: size of the center flat position (used by joydev) 1042 * @absflat: size of the center flat position (used by joydev)
1043 * @absres: resolution used for events coming form absolute axes
1043 * @open: this method is called when the very first user calls 1044 * @open: this method is called when the very first user calls
1044 * input_open_device(). The driver must prepare the device 1045 * input_open_device(). The driver must prepare the device
1045 * to start generating events (start polling thread, 1046 * to start generating events (start polling thread,
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index b3cd42d50e16..3bd018baae20 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
@@ -41,6 +41,9 @@ struct matrix_keymap_data {
41 * @col_scan_delay_us: delay, measured in microseconds, that is 41 * @col_scan_delay_us: delay, measured in microseconds, that is
42 * needed before we can keypad after activating column gpio 42 * needed before we can keypad after activating column gpio
43 * @debounce_ms: debounce interval in milliseconds 43 * @debounce_ms: debounce interval in milliseconds
44 * @active_low: gpio polarity
45 * @wakeup: controls whether the device should be set up as wakeup
46 * source
44 * 47 *
45 * This structure represents platform-specific data that use used by 48 * This structure represents platform-specific data that use used by
46 * matrix_keypad driver to perform proper initialization. 49 * matrix_keypad driver to perform proper initialization.