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

From: Lee Jones
Date: Wed Aug 01 2012 - 04:19:35 EST


On 01/08/12 08:37, Lee Jones wrote:
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@xxxxxxxxxx>

Actually, it does make sense?

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

That's interesting. Not only when I read it did it seem correct, I also wrote it wrong "as a sentence". Of course "so" should be "no".


--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/