diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 06:35:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 06:35:43 -0500 |
commit | dfa7c70b04bb20df7936018c737014655bf92d09 (patch) | |
tree | f5eb47ca770d70fe2d55006bc1a4e552b964c422 /sound/soc/s6000 | |
parent | 551102762ebe8bc0aa867d28960d9be97bbe17c1 (diff) | |
parent | b76fb39d49f67a484a6adc8f041d9ad833f6860e (diff) |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/s6000')
-rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/s6000/s6000-pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 8778faa174a..3052f64b240 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c | |||
@@ -434,7 +434,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { | |||
434 | .rate_max = 1562500, | 434 | .rate_max = 1562500, |
435 | }, | 435 | }, |
436 | .ops = &s6000_i2s_dai_ops, | 436 | .ops = &s6000_i2s_dai_ops, |
437 | } | 437 | }; |
438 | 438 | ||
439 | static int __devinit s6000_i2s_probe(struct platform_device *pdev) | 439 | static int __devinit s6000_i2s_probe(struct platform_device *pdev) |
440 | { | 440 | { |
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 271fd222bf1..ab3ccaec72d 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c | |||
@@ -473,7 +473,7 @@ static int s6000_pcm_new(struct snd_card *card, | |||
473 | } | 473 | } |
474 | 474 | ||
475 | res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED, | 475 | res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED, |
476 | s6000_soc_platform.name, pcm); | 476 | "s6000-audio", pcm); |
477 | if (res) { | 477 | if (res) { |
478 | printk(KERN_ERR "s6000-pcm couldn't get IRQ\n"); | 478 | printk(KERN_ERR "s6000-pcm couldn't get IRQ\n"); |
479 | return res; | 479 | return res; |
diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 2e977e4d65e..bf3f3f9165e 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c | |||
@@ -168,7 +168,7 @@ static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd) | |||
168 | 168 | ||
169 | snd_soc_dapm_sync(dapm); | 169 | snd_soc_dapm_sync(dapm); |
170 | 170 | ||
171 | snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec)); | 171 | snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&audio_out_mux, codec)); |
172 | 172 | ||
173 | return 0; | 173 | return 0; |
174 | } | 174 | } |