diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
| commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
| tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /sound/soc/s6000/s6000-pcm.c | |
| parent | 98b14d6b290d96b24ae993ceaccc59b2aa4b130c (diff) | |
| parent | c9de9333f5a860cab82052bce6ac28bcac9b2c26 (diff) | |
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'sound/soc/s6000/s6000-pcm.c')
| -rw-r--r-- | sound/soc/s6000/s6000-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 271fd222bf19..ab3ccaec72d2 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; |