Mash-up fix for hayabusa(MDW30/Screen C only!)

Change-Id: Iae2e88dec3e973eff16da37897e75ec37360d7f4
Fixed the conflict.

Merge commit 'a5a361cbc914c78ae8bc6496d0d6b2bf3c60d592' into cm-11.0

Conflicts:
	arch/arm/mach-msm/board-blue_hayabusa-camera.c

Change-Id: I97dd1ca55806a1ff2e0cbd744c48e385b337f239