aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/mxt224_u1.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
commit68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch)
tree5fb2d14340332062e416246c5759adcaa64a2340 /drivers/input/touchscreen/mxt224_u1.c
parent17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff)
parentb99374450c03bf5081b88995d91d34fb9b2fd040 (diff)
downloadkernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'drivers/input/touchscreen/mxt224_u1.c')
-rw-r--r--drivers/input/touchscreen/mxt224_u1.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/mxt224_u1.c b/drivers/input/touchscreen/mxt224_u1.c
index cd0674f..5a243fb 100644
--- a/drivers/input/touchscreen/mxt224_u1.c
+++ b/drivers/input/touchscreen/mxt224_u1.c
@@ -28,8 +28,6 @@
#include <mach/cpufreq.h>
#include <linux/input/mt.h>
-#include "../keyboard/cypress/cypress-touchkey.h"
-
#define OBJECT_TABLE_START_ADDRESS 7
#define OBJECT_TABLE_ELEMENT_SIZE 6
@@ -1339,10 +1337,6 @@ static void report_input_data(struct mxt224_data *data)
copy_data->lock_status = 1;
}
}
-
- /* tell cypress keypad we had finger activity */
- touchscreen_state_report(touch_is_pressed);
-
}
void palm_recovery(void)