Fix Compass/GPS

Conflicts:
	arch/arm/mach-msm/board-m2.c