diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-04 09:56:31 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-04 09:56:31 +0300 |
| commit | a5cba18c4de288335a975b5d57b68f6787330985 (patch) | |
| tree | 9d1e46eb1e53807f9d76a1ee25a5cd7a15ae00f5 /include | |
| parent | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (diff) | |
| parent | d55d0b56b9c3a0d94ca6cc1643063610c138dde9 (diff) | |
| download | linux-a5cba18c4de288335a975b5d57b68f6787330985.tar.xz | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.2 merge window.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input/touchscreen.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/input/touchscreen.h b/include/linux/input/touchscreen.h index 08a5ef6e8f25..eecc9ea6cd58 100644 --- a/include/linux/input/touchscreen.h +++ b/include/linux/input/touchscreen.h @@ -12,9 +12,10 @@ #include <linux/input.h> #ifdef CONFIG_OF -void touchscreen_parse_of_params(struct input_dev *dev); +void touchscreen_parse_of_params(struct input_dev *dev, bool multitouch); #else -static inline void touchscreen_parse_of_params(struct input_dev *dev) +static inline void touchscreen_parse_of_params(struct input_dev *dev, + bool multitouch) { } #endif |