remove htc color enhancement

Conflicts:

	arch/arm/mach-msm/board-deluxe_j-display.c
fix defined but not used error
fix monarudo regulator

Conflicts:

	arch/arm/mach-msm/board-deluxe_j-regulator.c
add ifdefs etc fix some build errors
Revert "pull in usb stuff from m7"

This reverts commit fd8e5b7cc9c9089d36e98e0710a0718c2a6addd3.