diff options
| author | Youngjin Kim <nkim@nvidia.com> | 2014-01-15 21:25:18 +0900 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-01-22 16:40:54 -0800 |
| commit | 34b13e274211ee4b72e99683752dc562710388a0 (patch) | |
| tree | 94eb70f4a7190e686b51ede19767a59fcd14ba61 /drivers | |
| parent | 6ea2e993796159926953739e7beada4b6e905b15 (diff) | |
input: touch: maxim: revert device splitting
Set number of input devices back to 1 and disable
the mutual exclusion of finger and stylus.
Bug 1439868
Change-Id: I104cd8f4fa71c542399e61ae0015465638f27d3c
Signed-off-by: Youngjin Kim <nkim@nvidia.com>
Reviewed-on: http://git-master/r/356008
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/maxim_sti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c index 47681d05181e..80c53ec93b43 100644 --- a/drivers/input/touchscreen/maxim_sti.c +++ b/drivers/input/touchscreen/maxim_sti.c @@ -35,11 +35,11 @@ * Custom features * \****************************************************************************/ -#define INPUT_DEVICES 2 +#define INPUT_DEVICES 1 #define INPUT_ENABLE_DISABLE 1 #define SUSPEND_POWER_OFF 1 #define NV_ENABLE_CPU_BOOST 1 -#define NV_STYLUS_FINGER_EXCLUSION 1 +#define NV_STYLUS_FINGER_EXCLUSION 0 #define ID_FINGER 0 #define ID_STYLUS (INPUT_DEVICES - 1) |