diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:56 -0400 |
| commit | 136823384fd3e8c5921769756b78f7cce3d35bce (patch) | |
| tree | 1a0890de99cc3081d96112ce67a7cb4ee2d99d98 | |
| parent | ac1cbbaa75d784ee0f8ac19ae72ce75e8841db13 (diff) | |
| parent | e7c8c589bb640a86685ee040e683b1ec93339f13 (diff) | |
Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next
| -rw-r--r-- | sound/soc/ux500/mop500.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index 8f5cd00a6e46..178d1bad6259 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c | |||
| @@ -52,6 +52,7 @@ static struct snd_soc_dai_link mop500_dai_links[] = { | |||
| 52 | 52 | ||
| 53 | static struct snd_soc_card mop500_card = { | 53 | static struct snd_soc_card mop500_card = { |
| 54 | .name = "MOP500-card", | 54 | .name = "MOP500-card", |
| 55 | .owner = THIS_MODULE, | ||
| 55 | .probe = NULL, | 56 | .probe = NULL, |
| 56 | .dai_link = mop500_dai_links, | 57 | .dai_link = mop500_dai_links, |
| 57 | .num_links = ARRAY_SIZE(mop500_dai_links), | 58 | .num_links = ARRAY_SIZE(mop500_dai_links), |