diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 00:02:54 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 00:02:54 -0800 |
commit | 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (patch) | |
tree | c5aa57e70d901ae05b25e61387a351e6b0b2826b /drivers/input/input-mt.c | |
parent | 037db524a2015607031c70a7935153120601b908 (diff) | |
parent | 0a0d62857366d8a6531e7fed1c3ccdd9a2b5b40b (diff) | |
download | blackbird-op-linux-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.tar.gz blackbird-op-linux-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.zip |
Merge branch 'for-linus' into next
Bring in changes to ads7846 to avoid mereg conflicts.
Diffstat (limited to 'drivers/input/input-mt.c')
-rw-r--r-- | drivers/input/input-mt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c index bf2f30c02589..c2f436ce7f5b 100644 --- a/drivers/input/input-mt.c +++ b/drivers/input/input-mt.c @@ -26,10 +26,14 @@ static void copy_abs(struct input_dev *dev, unsigned int dst, unsigned int src) * input_mt_init_slots() - initialize MT input slots * @dev: input device supporting MT events and finger tracking * @num_slots: number of slots used by the device + * @flags: mt tasks to handle in core * * This function allocates all necessary memory for MT slot handling * in the input device, prepares the ABS_MT_SLOT and * ABS_MT_TRACKING_ID events for use and sets up appropriate buffers. + * Depending on the flags set, it also performs pointer emulation and + * frame synchronization. + * * May be called repeatedly. Returns -EINVAL if attempting to * reinitialize with a different number of slots. */ |