openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2015-09-23 11:01:30 -07:00
parent 727e53a12f c81740e005
commit 4922e7a1b7
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/ux500/mop500.c
View File

@ -152,6 +152,7 @@ static const struct of_device_id snd_soc_mop500_match[] = {
{ .compatible = "stericsson,snd-soc-mop500", }, { .compatible = "stericsson,snd-soc-mop500", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, snd_soc_mop500_match);
static struct platform_driver snd_soc_mop500_driver = { static struct platform_driver snd_soc_mop500_driver = {
.driver = { .driver = {

1
sound/soc/ux500/ux500_msp_dai.c
View File

@ -843,6 +843,7 @@ static const struct of_device_id ux500_msp_i2s_match[] = {
{ .compatible = "stericsson,ux500-msp-i2s", }, { .compatible = "stericsson,ux500-msp-i2s", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, ux500_msp_i2s_match);
static struct platform_driver msp_i2s_driver = { static struct platform_driver msp_i2s_driver = {
.driver = { .driver = {