diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 03:56:12 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 03:56:12 -0400 |
| commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
| tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /sound/soc/samsung/smartq_wm8987.c | |
| parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
| parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) | |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'sound/soc/samsung/smartq_wm8987.c')
| -rw-r--r-- | sound/soc/samsung/smartq_wm8987.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index 0a2c4f22303..bbd14768ecd 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c | |||
| @@ -207,7 +207,7 @@ static struct snd_soc_dai_link smartq_dai[] = { | |||
| 207 | .cpu_dai_name = "samsung-i2s.0", | 207 | .cpu_dai_name = "samsung-i2s.0", |
| 208 | .codec_dai_name = "wm8750-hifi", | 208 | .codec_dai_name = "wm8750-hifi", |
| 209 | .platform_name = "samsung-audio", | 209 | .platform_name = "samsung-audio", |
| 210 | .codec_name = "wm8750-codec.0-0x1a", | 210 | .codec_name = "wm8750.0-0x1a", |
| 211 | .init = smartq_wm8987_init, | 211 | .init = smartq_wm8987_init, |
| 212 | .ops = &smartq_hifi_ops, | 212 | .ops = &smartq_hifi_ops, |
| 213 | }, | 213 | }, |