diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
| commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
| tree | 3fb6b00359a63d8d2e33005599046c105956d314 /arch/arm/mach-ux500/board-mop500-msp.c | |
| parent | a17fb8f520c3c662686aa54a86773f354002c7d3 (diff) | |
| parent | e534e871a94ba2e3bfdf0edd3685eb805fc960d8 (diff) | |
Merge branch 'fixes-wakeupgen' into fixes
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-msp.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-msp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 99604803874..df15646036a 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -191,9 +191,9 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, return pdev; } -/* Platform device for ASoC U8500 machine */ -static struct platform_device snd_soc_u8500 = { - .name = "snd-soc-u8500", +/* Platform device for ASoC MOP500 machine */ +static struct platform_device snd_soc_mop500 = { + .name = "snd-soc-mop500", .id = 0, .dev = { .platform_data = NULL, @@ -227,8 +227,8 @@ 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); + pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); + 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, |