summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorDaniel Glöckner <daniel-gl@gmx.net>2010-11-30 01:00:17 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-30 11:26:05 +0000
commit9e4ea718d3c53f9f2a65ddddf95ffd7743be458e (patch)
tree27726a5d53f62786caee53dcd7eb5103ac9116c3 /sound
parentb1d36b1c3573fd5adecbd313d30a8bdc8d7fbc5e (diff)
downloadlinux-3.10-9e4ea718d3c53f9f2a65ddddf95ffd7743be458e.tar.gz
linux-3.10-9e4ea718d3c53f9f2a65ddddf95ffd7743be458e.tar.bz2
linux-3.10-9e4ea718d3c53f9f2a65ddddf95ffd7743be458e.zip
s6000-pcm: fix compilation
s6000_soc_platform has lost its forward declaration and there no longer is a name element in it, so use a string constant when calling request_irq. Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/s6000/s6000-pcm.c2
1 files changed, 1 insertions, 1 deletions
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,
}
res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED,
- s6000_soc_platform.name, pcm);
+ "s6000-audio", pcm);
if (res) {
printk(KERN_ERR "s6000-pcm couldn't get IRQ\n");
return res;