Fix Touch

Conflicts:
	arch/arm/configs/cm_msm8x25_defconfig