diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /sound/soc/davinci/davinci-sffsdr.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/soc/davinci/davinci-sffsdr.c')
| -rw-r--r-- | sound/soc/davinci/davinci-sffsdr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c index 0fe558c65145..f71175b29e38 100644 --- a/sound/soc/davinci/davinci-sffsdr.c +++ b/sound/soc/davinci/davinci-sffsdr.c | |||
| @@ -93,6 +93,7 @@ static struct snd_soc_dai_link sffsdr_dai = { | |||
| 93 | /* davinci-sffsdr audio machine driver */ | 93 | /* davinci-sffsdr audio machine driver */ |
| 94 | static struct snd_soc_card snd_soc_sffsdr = { | 94 | static struct snd_soc_card snd_soc_sffsdr = { |
| 95 | .name = "DaVinci SFFSDR", | 95 | .name = "DaVinci SFFSDR", |
| 96 | .owner = THIS_MODULE, | ||
| 96 | .dai_link = &sffsdr_dai, | 97 | .dai_link = &sffsdr_dai, |
| 97 | .num_links = 1, | 98 | .num_links = 1, |
| 98 | }; | 99 | }; |