Revert "Revert "Merge omapzoom-changes into drivers/video/omap2/dss/dispc.c""

This reverts commit 608766c8aea74fe3cea98dedb23666b4edd860bf.
Disable drivers (not fixed) for now
Intelli-plug: fix