Merge branch 'for-2.6.30' into for-2.6.31

This commit is contained in:
Mark Brown 2009-04-23 16:09:52 +01:00
commit b933453f19

View file

@ -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");