Merge branch 'for-2.6.30' into for-2.6.31

b933453f · Mark Brown · 8eb9feab · a396e32e · b933453f
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

sound/soc/s3c24xx/s3c-i2s-v2.c sound/soc/s3c24xx/s3c-i2s-v2.c +2 -1

未找到文件。
--- 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");