dt2w: improve accuracy of single touch detection
proximity: power off the sensor if dt2w/s2w is disabled
input: declare variables dependant on s2w/dt2w when the features are disabled

Conflicts:
	include/linux/input/sweep2wake.h