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 /sound/soc/davinci/davinci-sffsdr.c | |
| parent | 48c88e820fb3e35c5925e4743fd13f200891b7b5 (diff) | |
| parent | bf86f07e8479f4de20d8b19748482eccda240664 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/davinci/davinci-sffsdr.c')
| -rw-r--r-- | sound/soc/davinci/davinci-sffsdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c index 009b6521a1bf..6c6666a1f942 100644 --- a/sound/soc/davinci/davinci-sffsdr.c +++ b/sound/soc/davinci/davinci-sffsdr.c @@ -84,7 +84,7 @@ static struct snd_soc_ops sffsdr_ops = { static struct snd_soc_dai_link sffsdr_dai = { .name = "PCM3008", /* Codec name */ .stream_name = "PCM3008 HiFi", - .cpu_dai_name = "davinci-asp.0", + .cpu_dai_name = "davinci-mcbsp", .codec_dai_name = "pcm3008-hifi", .codec_name = "pcm3008-codec", .platform_name = "davinci-pcm-audio", |