Merge branch 'for-2.6.30' into for-2.6.31

git-mirror · Apr 23, 2009 · b933453 · b933453
2 parents 8eb9fea + a396e32
commit b933453
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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");