Merge branch 'next' into for-linus

Prepare first round of input updates for 3.20.

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index f583ff639776..d7188de4db96 100644
--- 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);