Revert "[s2w/dt2w] Make power button also disable irq_wake in touch driver"

This reverts commit c9f3a03ffe7cb27083addb9b6db4fdf49f519b6b.
Revert "[s2w/dt2w pwrkey suspend]:  fix unbalanced irq_wake"

This reverts commit 26caf51257a74928acf2b7f36deca9d4b1e0c042.
Option to disable touch wake with power button

Signed-off-by: flar2 <asegaert@gmail.com>

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel.c
Merge branch 'mainstream' of https://github.com/emceethemouth/kernel_hammerhead into mainstream