Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b933453f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.30' into for-2.6.31

parents 8eb9feab a396e32e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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");