diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/include/linux/input/touchscreen.h | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/include/linux/input/touchscreen.h')
| -rw-r--r-- | kernel/include/linux/input/touchscreen.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/include/linux/input/touchscreen.h b/kernel/include/linux/input/touchscreen.h index 08a5ef6e8..c91e13761 100644 --- a/kernel/include/linux/input/touchscreen.h +++ b/kernel/include/linux/input/touchscreen.h @@ -9,14 +9,8 @@ #ifndef _TOUCHSCREEN_H #define _TOUCHSCREEN_H -#include <linux/input.h> +struct input_dev; -#ifdef CONFIG_OF -void touchscreen_parse_of_params(struct input_dev *dev); -#else -static inline void touchscreen_parse_of_params(struct input_dev *dev) -{ -} -#endif +void touchscreen_parse_properties(struct input_dev *dev, bool multitouch); #endif |