diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-11-23 12:41:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-11-23 12:41:17 +0100 |
commit | 9e8c32cac9929858337e29dd4e28fd87bc073ef5 (patch) | |
tree | 81643da2131561b729a09adbbced293b008c6cbf /arch/arm/mach-davinci/dm355.c | |
parent | ALSA: hda - Identify more variants for ALC269 (diff) | |
parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc (diff) | |
download | linux-dev-9e8c32cac9929858337e29dd4e28fd87bc073ef5.tar.xz linux-dev-9e8c32cac9929858337e29dd4e28fd87bc073ef5.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
-rw-r--r-- | arch/arm/mach-davinci/dm355.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 9be261beae7d..2652af124acd 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = { CLK(NULL, "uart1", &uart1_clk), CLK(NULL, "uart2", &uart2_clk), CLK("i2c_davinci.1", NULL, &i2c_clk), - CLK("davinci-asp.0", NULL, &asp0_clk), - CLK("davinci-asp.1", NULL, &asp1_clk), + CLK("davinci-mcbsp.0", NULL, &asp0_clk), + CLK("davinci-mcbsp.1", NULL, &asp1_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), CLK("davinci_mmc.1", NULL, &mmcsd1_clk), CLK("spi_davinci.0", NULL, &spi0_clk), @@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = { }; static struct platform_device dm355_asp1_device = { - .name = "davinci-asp", + .name = "davinci-mcbsp", .id = 1, .num_resources = ARRAY_SIZE(dm355_asp1_resources), .resource = dm355_asp1_resources, |