From 196d83f4d537b2d4d11cb005d7b3d8a76b8e6937 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 16 Nov 2009 22:12:20 -0800
Subject: [PATCH] --- yaml --- r: 174232 b: refs/heads/master c:
 d69249f4b6857c0b23ceca270ae591381b16bba9 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/Documentation/DocBook/device-drivers.tmpl | 9 +++++++++
 trunk/include/linux/input.h                     | 1 +
 trunk/include/linux/input/matrix_keypad.h       | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0ba6a3340c63..a8b2f5d98eed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dad725d089b94bce8bbc769b7471dcfba3fbda0e
+refs/heads/master: d69249f4b6857c0b23ceca270ae591381b16bba9
diff --git a/trunk/Documentation/DocBook/device-drivers.tmpl b/trunk/Documentation/DocBook/device-drivers.tmpl
index 94a20fe8fedf..e994d1d9fbe6 100644
--- a/trunk/Documentation/DocBook/device-drivers.tmpl
+++ b/trunk/Documentation/DocBook/device-drivers.tmpl
@@ -293,10 +293,19 @@ X!Idrivers/video/console/fonts.c
 
   <chapter id="input_subsystem">
      <title>Input Subsystem</title>
+     <sect1><title>Input core</title>
 !Iinclude/linux/input.h
 !Edrivers/input/input.c
 !Edrivers/input/ff-core.c
 !Edrivers/input/ff-memless.c
+     </sect1>
+     <sect1><title>Polled input devices</title>
+!Iinclude/linux/input-polldev.h
+!Edrivers/input/input-polldev.c
+     </sect1>
+     <sect1><title>Matrix keyboars/keypads</title>
+!Iinclude/linux/input/matrix_keypad.h
+     </sect1>
   </chapter>
 
   <chapter id="spi">
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 9a04e26daab2..56d8e048c646 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -1040,6 +1040,7 @@ struct ff_effect {
  * @absmin: minimum values for events coming from absolute axes
  * @absfuzz: describes noisiness for axes
  * @absflat: size of the center flat position (used by joydev)
+ * @absres: resolution used for events coming form absolute axes
  * @open: this method is called when the very first user calls
  *	input_open_device(). The driver must prepare the device
  *	to start generating events (start polling thread,
diff --git a/trunk/include/linux/input/matrix_keypad.h b/trunk/include/linux/input/matrix_keypad.h
index b3cd42d50e16..3bd018baae20 100644
--- a/trunk/include/linux/input/matrix_keypad.h
+++ b/trunk/include/linux/input/matrix_keypad.h
@@ -41,6 +41,9 @@ struct matrix_keymap_data {
  * @col_scan_delay_us: delay, measured in microseconds, that is
  *	needed before we can keypad after activating column gpio
  * @debounce_ms: debounce interval in milliseconds
+ * @active_low: gpio polarity
+ * @wakeup: controls whether the device should be set up as wakeup
+ *	source
  *
  * This structure represents platform-specific data that use used by
  * matrix_keypad driver to perform proper initialization.