diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:17 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:17 -0800 |
| commit | fc10c6db770b84dde1855b3155cf39b7a0373fbb (patch) | |
| tree | b508a3bf5bfe750f53f59d30ca20f63d4e252e94 | |
| parent | 6caa9892c364d9689b2807bc7940eaaade872cb0 (diff) | |
| parent | 99d8d3ba512810feb13e158042975dcda75cef31 (diff) | |
| download | op-kernel-dev-fc10c6db770b84dde1855b3155cf39b7a0373fbb.zip op-kernel-dev-fc10c6db770b84dde1855b3155cf39b7a0373fbb.tar.gz | |
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
| -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; } } |
