aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-26 17:17:42 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-26 17:17:42 +0100
commit37fa84d8e647e584bf1b71bdff0330049e34f5ef (patch)
tree6575dc8f4771be4677a2810756b1be518db1eb55 /sound/soc/sh
parent5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 (diff)
parent25436180ee8bed6740f29d92c2030c759885c147 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/ssi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index 40bbdf1591d..05192d97b37 100644
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -387,7 +387,7 @@ static int __devinit sh4_soc_dai_probe(struct platform_device *pdev)
static int __devexit sh4_soc_dai_remove(struct platform_device *pdev)
{
- snd_soc_unregister_dai(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+ snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
return 0;
}