drivers/input/touchscreen: fix some merge derps

Signed-off-by: Joao Paulo <joaolrpaulo@gmail.com>