From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org,
sameo@linux.intel.com, arnd@arndb.de,
broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se,
STEricsson_nomadik_linux@list.st.com,
Lee Jones <lee.jones@linaro.org>,
lrg@ti.com, linus.walleij@stericsson.com
Subject: [PATCH 6/7] ARM: ux500: Fix merge error, so such struct 'snd_soc_u8500'
Date: Fri, 27 Jul 2012 13:38:53 +0100 [thread overview]
Message-ID: <1343392734-11805-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1343392734-11805-1-git-send-email-lee.jones@linaro.org>
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>
---
arch/arm/mach-ux500/board-mop500-msp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index 9960480..1b6a193 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -228,7 +228,7 @@ int mop500_msp_init(struct device *parent)
struct platform_device *msp1;
pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);
- platform_device_register(&snd_soc_u8500);
+ platform_device_register(&snd_soc_mop500);
pr_info("Initialize MSP I2S-devices.\n");
db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
--
1.7.9.5
next prev parent reply other threads:[~2012-07-27 12:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-27 12:38 [PATCH 0/7] Bugfixes and clean-ups bound for the v3.6 RCs Lee Jones
2012-07-27 12:38 ` [PATCH 1/7] ASoC: dapm: If one widget fails, do not force all subsequent widgets to fail too Lee Jones
2012-07-29 20:25 ` Mark Brown
2012-07-27 12:38 ` [PATCH 2/7] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements Lee Jones
2012-07-27 12:38 ` [PATCH 3/7] mfd: db8500-prcmu: Ensure AB8500 platform data is passed through MFD Core Lee Jones
2012-07-27 13:36 ` Samuel Ortiz
2012-07-27 12:38 ` [PATCH 4/7] mfd: ab8500-core: Apply the AB8500 CODEC's compatible string to its MFD cell Lee Jones
2012-07-27 13:36 ` Samuel Ortiz
2012-07-29 20:28 ` Mark Brown
2012-07-30 13:24 ` Samuel Ortiz
2012-09-14 16:05 ` Lee Jones
2012-09-19 11:28 ` Samuel Ortiz
2012-07-27 12:38 ` [PATCH 5/7] ARM: ux500: Remove unused snowball_of_platform_devs struct Lee Jones
2012-07-27 12:38 ` Lee Jones [this message]
2012-07-27 12:38 ` [PATCH 7/7] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled 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=1343392734-11805-7-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=ola.o.lilja@stericsson.com \
--cc=olalilja@yahoo.se \
--cc=sameo@linux.intel.com \
/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).