Fix warnings
M2: mach-msm: *-storage: back to 8960-storage, with SDDC4 additions from samsung kernel

Conflicts:

	arch/arm/mach-msm/Makefile