diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-26 16:31:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-26 16:31:40 +0200 |
| commit | 35bcc3c20d22f6a3ac4007e8ab20926c6b5c4140 (patch) | |
| tree | 92926cf78d04fecf6018f71c82fd61973df14e62 /sound/soc/davinci/davinci-i2s.c | |
| parent | ASoC: omap: Replace instances of rtd->codec->card with rtd->card (diff) | |
| parent | ASoC: davinci: add dependencies for SND_SOC_TLV320AIC3X (diff) | |
| download | linux-35bcc3c20d22f6a3ac4007e8ab20926c6b5c4140.tar.xz linux-35bcc3c20d22f6a3ac4007e8ab20926c6b5c4140.zip | |
Merge branch 'topic/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.c')
| -rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index ebe82947bab3..7682af31d6e6 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -757,7 +757,6 @@ static int davinci_i2s_remove(struct platform_device *pdev) struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev); snd_soc_unregister_component(&pdev->dev); - davinci_soc_platform_unregister(&pdev->dev); clk_disable(dev->clk); clk_put(dev->clk); |