diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-23 11:09:52 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-23 11:09:52 -0400 |
| commit | b933453f1965c1e3136cb5fd69abd6e6927fb5d7 (patch) | |
| tree | ce82dcad40e6c35fc5b95eb69e74d3515154a7e4 | |
| parent | 8eb9feabe566d8272510d5fb33f55a72e3ab3ce4 (diff) | |
| parent | a396e32ef0f3b98700abb9a6da3530c945e55908 (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
| -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"); | ||