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

Commit 4922e7a1 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 727e53a1 c81740e0

sound/soc/ux500/mop500.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static const struct of_device_id snd_soc_mop500_match[] = { 
	{ .compatible = "stericsson,snd-soc-mop500", },

	{},

};

MODULE_DEVICE_TABLE(of, snd_soc_mop500_match);



static struct platform_driver snd_soc_mop500_driver = {

	.driver = {

sound/soc/ux500/ux500_msp_dai.c

+1 −0
Original line number Diff line number Diff line
@@ -843,6 +843,7 @@ static const struct of_device_id ux500_msp_i2s_match[] = { 
	{ .compatible = "stericsson,ux500-msp-i2s", },

	{},

};

MODULE_DEVICE_TABLE(of, ux500_msp_i2s_match);



static struct platform_driver msp_i2s_driver = {

	.driver = {