Fix some board files
Remove stray MACHINE_START from board file.
Going back on camera headers.

Conflicts:
	arch/arm/mach-msm/include/mach/camera.h
	drivers/media/video/msm/io/msm_camera_i2c.h
Fixes to board-mako-display.
Fixes to board-mako-pmic.