diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:24 +0100 |
| commit | b2d34a822bb2c9a17f24300de6cc79fe92f10787 (patch) | |
| tree | ad876faf8cdbd927f724f7d369f9cce3a34fe680 /sound/soc | |
| parent | c76a507bfeaeaa82f2e306266a0722b1a2d37fde (diff) | |
| parent | 18b494527bc3e6847e34d18e540c78a12c3aef2f (diff) | |
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/Makefile | 1 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 2b225945359b..a725905b2c68 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -26,7 +26,6 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index eadbfb6b5000..7483efb6dc67 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -814,8 +814,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) clk_put(mcbsp->fclk); - platform_set_drvdata(pdev, NULL); - return 0; } |