diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 14:54:51 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 14:54:51 +0100 |
commit | 41b51dd47ea7c406a8d49b97804e8acec9dadaed (patch) | |
tree | 97c2d4f303a2c575582c2882d4c3b79f880e254a /sound/soc/omap/omap3evm.c | |
parent | Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
parent | ASoC: tlv320aic23 fix rate selection (diff) | |
download | linux-41b51dd47ea7c406a8d49b97804e8acec9dadaed.tar.xz linux-41b51dd47ea7c406a8d49b97804e8acec9dadaed.zip |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/omap/omap3evm.c')
-rw-r--r-- | sound/soc/omap/omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 8deb59bb10b1..f484dcd63408 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -151,4 +151,4 @@ module_exit(omap3evm_soc_exit); MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); |