diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:31 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:31 +0000 |
commit | cde4d7596c838e073ad0f1f9bd04e7ac01778d34 (patch) | |
tree | ccd4625f03507b02c8ac23bb173249eb4df5a6da /sound/soc/kirkwood | |
parent | 971a6f45e071447975c33d6747f95a1e385d0f45 (diff) | |
parent | fc7dc61d9a87011aaf8a6eb3144ebf9552adf5d2 (diff) | |
download | op-kernel-dev-cde4d7596c838e073ad0f1f9bd04e7ac01778d34.zip op-kernel-dev-cde4d7596c838e073ad0f1f9bd04e7ac01778d34.tar.gz |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 9ec38d1..d34d917 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -568,7 +568,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) } else { dev_info(&pdev->dev, "found external clock\n"); clk_prepare_enable(priv->extclk); - soc_dai = &kirkwood_i2s_dai_extclk; + soc_dai = kirkwood_i2s_dai_extclk; } } |