summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/s3c2412-i2s.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-05 13:25:17 +0400
committerTakashi Iwai <tiwai@suse.de>2012-05-05 13:25:17 +0400
commit20c76945d05e26dc24eabcfc2f61f3929590cc29 (patch)
tree73238b71823f829413a51923df6179e7fd122ab6 /sound/soc/samsung/s3c2412-i2s.c
parentcff7873554eedc044029c41a9fd694245d97eff8 (diff)
parent06412088ce98f745405b8f65cfc51ddd6b842bbf (diff)
downloadlinux-20c76945d05e26dc24eabcfc2f61f3929590cc29.tar.xz
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.4 Nothing terribly exciting here, a bunch of small and simple fixes scattered around the place.
Diffstat (limited to 'sound/soc/samsung/s3c2412-i2s.c')
-rw-r--r--sound/soc/samsung/s3c2412-i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 72185078ddf8..79fbeea99d46 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -166,7 +166,7 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = {
static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev)
{
- return snd_soc_register_dai(&pdev->dev, &s3c2412_i2s_dai);
+ return s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
}
static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev)