Messages in this thread Patch in this message | | | Date | Thu, 9 Dec 2010 00:58:14 -0800 | From | Dmitry Torokhov <> | Subject | Re: [GIT PULL] input: mt updates for 2.6.38 |
| |
On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote: > Dmitry, > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next > > to receive input-mt updates for 2.6.38. > > The tree contains core changes as well as dependent changes to hid drivers. You > also find the new hid-egalax driver in there, signed off by Jiri.
Pulled, thank you Henrik.
I wonder if we should move input-mt.h into input/mt.h (and if someone would bother to input-polldev.h there that would be great too).
Also I try to sync with mainline once per release, at -rc1, unless I know that my changes will conflict with some other work. I'd recommend you do the same so that when I pull from you I am getting just your changes and not the rest of stuff from mainline.
BTW, we need to document dev->trkid to avoid complaints from 'make htmldocs' and friends. I wonder if the patch below will do.
Thanks.
-- Dmitry
Input: document new trkid field in struct input_dev
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru> ---
include/linux/input.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/input.h b/include/linux/input.h index 6914269..56bf497 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -1182,6 +1182,7 @@ struct ff_effect { * of tracked contacts * @mtsize: number of MT slots the device uses * @slot: MT slot currently being transmitted + * @trkid: stores MT tracking ID for the current contact * @absinfo: array of &struct input_absinfo elements holding information * about absolute axes (current value, min, max, flat, fuzz, * resolution)
| |