summaryrefslogtreecommitdiff
path: root/include/linux/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-18 13:29:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-18 13:29:03 -0700
commit96fd2d57b8252e16dfacf8941f7a74a6119197f5 (patch)
tree095269c51def85fa1be27bb20ec8e562bdc5a564 /include/linux/input
parent8a83f33100c691f5a576dba259cc05502dc358f0 (diff)
parentc36b58e8a9112017c2bcc322cc98e71241814303 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: xen-kbdfront - fix mouse getting stuck after save/restore Input: estimate number of events per packet Input: evdev - indicate buffer overrun with SYN_DROPPED Input: document event types and codes and their intended use Input: add KEY_IMAGES specifically for AL Image Browser Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe() Input: h3600_ts - fix error handling at connect Input: twl4030_keypad - avoid potential NULL-pointer dereference
Diffstat (limited to 'include/linux/input')
-rw-r--r--include/linux/input/mt.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index b3ac06a4435d..318bb82325a6 100644
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -48,6 +48,12 @@ static inline void input_mt_slot(struct input_dev *dev, int slot)
input_event(dev, EV_ABS, ABS_MT_SLOT, slot);
}
+static inline bool input_is_mt_axis(int axis)
+{
+ return axis == ABS_MT_SLOT ||
+ (axis >= ABS_MT_FIRST && axis <= ABS_MT_LAST);
+}
+
void input_mt_report_slot_state(struct input_dev *dev,
unsigned int tool_type, bool active);