diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 15:06:17 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 15:06:17 +0400 |
| commit | 89bc3f2c931811fdcf0f9c88dac9d5434d120e8e (patch) | |
| tree | 12a83661299d81e31fa329ab0a07ea77f76aac79 /sound | |
| parent | 1df63cc0f0eaa37d102cfccd617a21643ee56cb7 (diff) | |
| parent | 58f5a7151efe2a3039b097883e6ba9fb24e42536 (diff) | |
| download | linux-89bc3f2c931811fdcf0f9c88dac9d5434d120e8e.tar.xz | |
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index ee10e8704e97..13f6dd1ceb00 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -469,7 +469,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) { int ret = 0; - ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai); + ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai); if (ret) { pr_err("failed to register the dai\n"); return ret; |