derp derp fix delue_j board

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
yet another derp

Conflicts:

	arch/arm/mach-msm/board-deluxe_j.c
revert camera revamp