diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-28 08:25:43 +0100 |
| commit | dcc3c4c016481de3fdb99c1f6ecb04d4229513d4 (patch) | |
| tree | d3d40306e6dfe0971c6f7fca6a0e37bbe66d2215 /sound/soc/pxa/spitz.c | |
| parent | ded9f5238bb719737f82b0b5b957937cb0203804 (diff) | |
| parent | a3adfa00e8089aa72826c6ba04bcb18cfceaf0a9 (diff) | |
| download | kernel_samsung_crespo-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.zip kernel_samsung_crespo-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.gz kernel_samsung_crespo-dcc3c4c016481de3fdb99c1f6ecb04d4229513d4.tar.bz2 | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/spitz.c')
| -rw-r--r-- | sound/soc/pxa/spitz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index c2acb69..8e15713 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_dai_link spitz_dai = { .name = "wm8750", .stream_name = "WM8750", - .cpu_dai_name = "pxa-is2", + .cpu_dai_name = "pxa2xx-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750-codec.0-001a", + .codec_name = "wm8750-codec.0-001b", .init = spitz_wm8750_init, .ops = &spitz_ops, }; |