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/h1940_uda1380.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/soc/samsung/h1940_uda1380.c')
| -rw-r--r-- | sound/soc/samsung/h1940_uda1380.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 03cfa5fcdcc..6e3257717c5 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c | |||
| @@ -215,6 +215,7 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = { | |||
| 215 | 215 | ||
| 216 | static struct snd_soc_card h1940_asoc = { | 216 | static struct snd_soc_card h1940_asoc = { |
| 217 | .name = "h1940", | 217 | .name = "h1940", |
| 218 | .owner = THIS_MODULE, | ||
| 218 | .dai_link = h1940_uda1380_dai, | 219 | .dai_link = h1940_uda1380_dai, |
| 219 | .num_links = ARRAY_SIZE(h1940_uda1380_dai), | 220 | .num_links = ARRAY_SIZE(h1940_uda1380_dai), |
| 220 | 221 | ||