diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-27 11:15:32 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-27 11:15:32 -0400 |
| commit | f0787f62df516df6975d4325795ed02c495f3728 (patch) | |
| tree | fdd3bddb1c70bec9a8d6d7f4710186fc0e27564a /sound/soc/s3c24xx | |
| parent | ce8a7424d23a36f043d0de8484f888971c831119 (diff) | |
| parent | a396e32ef0f3b98700abb9a6da3530c945e55908 (diff) | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: s3c-i2s-v2 needs to declare a license for modular builds
ASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991
ASoC: Fix WM8580 volume update handling for large register changes
ASoC: Fix offset of freqmode in WM8580 PLL configuration
Diffstat (limited to 'sound/soc/s3c24xx')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 689ffcd17e1f..ab680aac3fcb 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c | |||
| @@ -636,5 +636,6 @@ int s3c_i2sv2_register_dai(struct snd_soc_dai *dai) | |||
| 636 | 636 | ||
| 637 | return snd_soc_register_dai(dai); | 637 | return snd_soc_register_dai(dai); |
| 638 | } | 638 | } |
| 639 | |||
| 640 | EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); | 639 | EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); |
| 640 | |||
| 641 | MODULE_LICENSE("GPL"); | ||