diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 16:35:24 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 16:35:24 +0300 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /include/linux/input | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
| download | linux-067e2601d3c076abbf45db91261f9065eaa879b2.tar.xz | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'include/linux/input')
| -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 |