diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-23 17:09:52 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-23 17:09:52 +0200 |
| commit | b933453f1965c1e3136cb5fd69abd6e6927fb5d7 (patch) | |
| tree | ce82dcad40e6c35fc5b95eb69e74d3515154a7e4 /sound/soc | |
| parent | ASoC: change stereo/mono to 32-bit/16-bit for pxa-ssp (diff) | |
| parent | ASoC: s3c-i2s-v2 needs to declare a license for modular builds (diff) | |
| download | linux-b933453f1965c1e3136cb5fd69abd6e6927fb5d7.tar.xz linux-b933453f1965c1e3136cb5fd69abd6e6927fb5d7.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc')
| -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) return snd_soc_register_dai(dai); } - EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); + +MODULE_LICENSE("GPL"); |