Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2d34a82 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

parents c76a507b 18b49452

sound/soc/omap/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/omap/omap-mcbsp.c

+0 −2
Original line number Diff line number Diff line
@@ -814,8 +814,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) 


	clk_put(mcbsp->fclk);



	platform_set_drvdata(pdev, NULL);



	return 0;

}