From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500'
Date: Wed, 01 Aug 2012 09:19:34 +0100 [thread overview]
Message-ID: <5018E696.9000305@linaro.org> (raw)
In-Reply-To: <5018DC9F.30502@linaro.org>
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@linaro.org>
>
> 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
next prev parent reply other threads:[~2012-08-01 8:19 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 13:31 [PATCH 1/6] Bugfixes and clean-ups bound for the v3.6 RCs Lee Jones
2012-07-31 13:31 ` [PATCH 1/6] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements Lee Jones
2012-07-31 13:31 ` [PATCH 1/6] ASoC: dapm: If one widget fails, do not force all subsequent widgets to fail too Lee Jones
2012-07-31 13:42 ` Mark Brown
2012-07-31 14:25 ` Lee Jones
2012-07-31 14:28 ` Mark Brown
2012-07-31 14:38 ` Lee Jones
2012-07-31 14:54 ` Mark Brown
2012-07-31 15:15 ` Lee Jones
2012-07-31 15:18 ` Mark Brown
2012-08-01 7:19 ` Lee Jones
2012-08-01 13:20 ` Mark Brown
2012-08-01 13:50 ` Lee Jones
2012-08-01 16:08 ` Mark Brown
2012-08-01 19:41 ` [alsa-devel] " Mark Brown
2012-08-02 7:45 ` Lee Jones
2012-08-02 17:56 ` Mark Brown
2012-08-03 8:30 ` Lee Jones
2012-08-04 0:48 ` Mark Brown
2012-08-02 5:58 ` Ola Lilja
2012-08-02 9:59 ` Mark Brown
2012-08-10 11:43 ` Linus Walleij
2012-08-02 12:21 ` Lee Jones
2012-07-31 13:31 ` [PATCH 2/6] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
2012-07-31 13:31 ` [PATCH 2/6] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements Lee Jones
2012-07-31 13:31 ` [PATCH 3/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Lee Jones
2012-07-31 16:46 ` Sergei Shtylyov
2012-08-01 7:37 ` Lee Jones
2012-08-01 8:19 ` Lee Jones [this message]
2012-08-01 8:46 ` [PATCH 3/6 v2] ARM: ux500: Fix merge error, no matching driver name for, 'snd_soc_u8500' Lee Jones
2012-07-31 13:31 ` [PATCH 3/6] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 13:31 ` [PATCH 4/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Lee Jones
2012-07-31 13:31 ` [PATCH 4/6] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500' Lee Jones
2012-07-31 20:58 ` Arnd Bergmann
2012-07-31 13:31 ` [PATCH 5/6] ARM: ux500: Enable HIGHMEM on all mop500 platforms Lee Jones
2012-07-31 13:56 ` Russell King - ARM Linux
2012-07-31 14:29 ` Lee Jones
2012-07-31 14:37 ` Russell King - ARM Linux
2012-07-31 20:50 ` Arnd Bergmann
2012-07-31 22:01 ` Russell King - ARM Linux
2012-08-01 7:56 ` Lee Jones
2012-08-01 8:41 ` Russell King - ARM Linux
2012-08-01 8:48 ` Lee Jones
2012-07-31 13:31 ` [PATCH 5/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Lee Jones
2012-07-31 20:54 ` Arnd Bergmann
2012-08-01 7:34 ` Lee Jones
2012-08-01 13:32 ` Arnd Bergmann
2012-08-01 13:55 ` Lee Jones
2012-08-01 14:32 ` Arnd Bergmann
2012-07-31 13:31 ` [PATCH 6/6] ARM: ux500: Enable HIGHMEM on all mop500 platforms Lee Jones
2012-07-31 13:31 ` [PATCH 6/6] ASoC: Ux500: Move MSP pinctrl setup into the MSP driver Lee Jones
2012-07-31 13:40 ` [PATCH 1/6] Bugfixes and clean-ups bound for the v3.6 RCs Mark Brown
2012-07-31 14:30 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5018E696.9000305@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).