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/samsung/jive_wm8750.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/soc/samsung/jive_wm8750.c')
| -rw-r--r-- | sound/soc/samsung/jive_wm8750.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/samsung/jive_wm8750.c b/sound/soc/samsung/jive_wm8750.c index 8e523fd9189e..1578663a1faa 100644 --- a/sound/soc/samsung/jive_wm8750.c +++ b/sound/soc/samsung/jive_wm8750.c | |||
| @@ -127,6 +127,7 @@ static struct snd_soc_dai_link jive_dai = { | |||
| 127 | /* jive audio machine driver */ | 127 | /* jive audio machine driver */ |
| 128 | static struct snd_soc_card snd_soc_machine_jive = { | 128 | static struct snd_soc_card snd_soc_machine_jive = { |
| 129 | .name = "Jive", | 129 | .name = "Jive", |
| 130 | .owner = THIS_MODULE, | ||
| 130 | .dai_link = &jive_dai, | 131 | .dai_link = &jive_dai, |
| 131 | .num_links = 1, | 132 | .num_links = 1, |
| 132 | 133 | ||