summaryrefslogtreecommitdiff
path: root/sound/soc/s3c24xx
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-27 17:15:32 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-27 17:15:32 +0200
commitf0787f62df516df6975d4325795ed02c495f3728 (patch)
treefdd3bddb1c70bec9a8d6d7f4710186fc0e27564a /sound/soc/s3c24xx
parentce8a7424d23a36f043d0de8484f888971c831119 (diff)
parenta396e32ef0f3b98700abb9a6da3530c945e55908 (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.c3
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)
return snd_soc_register_dai(dai);
}
-
EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai);
+
+MODULE_LICENSE("GPL");