[alsa-devel] [PATCH 6/7] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500'