dt2w/s2w fix again

Conflicts:
	drivers/input/touchscreen/doubletap2wake.c
	drivers/input/touchscreen/sweep2wake.c