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

On 31/07/12 17:46, Sergei Shtylyov wrote:

Hello.

On 07/31/2012 05:31 PM, Lee Jones wrote:

Subject doesn't parse for me...

...

The platform attempts to register platform device 'snd_soc_u8500' which doesn't actually exist. Here we change the reference to the correct one 'snd_soc_mop500'.

...

Signed-off-by: Lee Jones lee.jones@linaro.org

Actually, it does make sense?

As a sentence: "This patch fixes merge error: so such structure 'struct snd_soc_u8500'.