Fix building with mt9d015 disabled

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