Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Sep 23, 2015
2 parents 727e53a + c81740e commit 4922e7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions sound/soc/ux500/mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
1 change: 1 addition & 0 deletions sound/soc/ux500/ux500_msp_dai.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 4922e7a

Please sign in to comment.