Re: [alsa-devel] [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge