Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-07 04:09:21 +00:00
Code Issues Projects Releases Wiki Activity

ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'

Browse source 
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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Lee Jones 2012-08-09 16:47:27 +01:00 committed by Linus Walleij
parent d9875690d9
commit 97f50c6c41
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/mach-ux500/board-mop500-msp.c
View file

@ -191,9 +191,9 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent,
return pdev; return pdev;
} }
/* Platform device for ASoC U8500 machine */ /* Platform device for ASoC MOP500 machine */
static struct platform_device snd_soc_u8500 = { static struct platform_device snd_soc_mop500 = {
.name = "snd-soc-u8500", .name = "snd-soc-mop500",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = NULL, .platform_data = NULL,
@ -227,8 +227,8 @@ int mop500_msp_init(struct device *parent)
{ {
struct platform_device *msp1; struct platform_device *msp1;
pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
platform_device_register(&snd_soc_u8500); platform_device_register(&snd_soc_mop500);
pr_info("Initialize MSP I2S-devices.\n"); pr_info("Initialize MSP I2S-devices.\n");
db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0, db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,