Fix #ifdef CONFIG_MACH_VILLEC2

Conflicts:
	arch/arm/mach-msm/qdsp6v2/snddev_icodec.h