Revert "synaptics: remove logo2menu, sweep2wake, etc"

This reverts commit cd8f4eb174a0bbb85b36b68416fafac2f89a7d99.

Conflicts:
	arch/arm/configs/cyanogenmod_m7_defconfig
	drivers/input/touchscreen/Kconfig