aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-06 09:50:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-06 09:50:39 -0700
commit1b74a8684e3c5cbbe5e798de9e07e3a087c7b853 (patch)
treeb8c66506e1f4d18113796e94d4ab5d30b6f07b2c /include
parentc4aed353b1b079eb4843e6a708fc68b4b28f72aa (diff)
parent9b7e31bbf4bb58b12e11a7f24b7c3e48bbd2f4da (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov: "Two fixes for regressions in Wacom driver and fixes for drivers using threaded IRQ framework without specifying IRQF_ONESHOT." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: request threaded-only IRQs with IRQF_ONESHOT Input: wacom - don't retrieve touch_max when it is predefined Input: wacom - fix retrieving touch_max bug Input: fix input.h kernel-doc warning
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index a8167145357..2740d080ec6 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -116,6 +116,7 @@ struct input_keymap_entry {
/**
* EVIOCGMTSLOTS(len) - get MT slot values
+ * @len: size of the data buffer in bytes
*
* The ioctl buffer argument should be binary equivalent to
*