Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / input / mt.h

diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index f583ff6..d7188de 100644 (file)
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -119,7 +119,8 @@ struct input_mt_pos {
 };
 
 int input_mt_assign_slots(struct input_dev *dev, int *slots,
-                         const struct input_mt_pos *pos, int num_pos);
+                         const struct input_mt_pos *pos, int num_pos,
+                         int dmax);
 
 int input_mt_get_slot_by_key(struct input_dev *dev, int key);