diff options
author | Mark Brown <broonie@kernel.org> | 2015-09-23 14:01:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-23 14:01:30 -0400 |
commit | 4922e7a1b767fcf6f29ce121ad74e424f4045eff (patch) | |
tree | 9819b257d873efa840f8326eb18683097210bf5d | |
parent | 727e53a12fed3ab2d5fadb7aa3c510d506a9d716 (diff) | |
parent | c81740e00556312af32fb3cd5ec12174935e5f70 (diff) |
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
-rw-r--r-- | sound/soc/ux500/mop500.c | 1 | ||||
-rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index 4e0c0e502ade..ba9fc099cf67 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c | |||
@@ -152,6 +152,7 @@ static const struct of_device_id snd_soc_mop500_match[] = { | |||
152 | { .compatible = "stericsson,snd-soc-mop500", }, | 152 | { .compatible = "stericsson,snd-soc-mop500", }, |
153 | {}, | 153 | {}, |
154 | }; | 154 | }; |
155 | MODULE_DEVICE_TABLE(of, snd_soc_mop500_match); | ||
155 | 156 | ||
156 | static struct platform_driver snd_soc_mop500_driver = { | 157 | static struct platform_driver snd_soc_mop500_driver = { |
157 | .driver = { | 158 | .driver = { |
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index f5df08ded770..6ba8ae9ecc7a 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c | |||
@@ -843,6 +843,7 @@ static const struct of_device_id ux500_msp_i2s_match[] = { | |||
843 | { .compatible = "stericsson,ux500-msp-i2s", }, | 843 | { .compatible = "stericsson,ux500-msp-i2s", }, |
844 | {}, | 844 | {}, |
845 | }; | 845 | }; |
846 | MODULE_DEVICE_TABLE(of, ux500_msp_i2s_match); | ||
846 | 847 | ||
847 | static struct platform_driver msp_i2s_driver = { | 848 | static struct platform_driver msp_i2s_driver = { |
848 | .driver = { | 849 | .driver = { |