kernel/power/main: fix #ifdef derp by HTC :p

Signed-off-by: Paul Reioux <reioux@gmail.com>
board-m7-display: added O2 DE specific patches from HTC source drop

(crc-3.4.10-87f8d97)

Signed-off-by: faux123 <reioux@gmail.com>