diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:58:15 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:58:15 +0100 |
commit | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch) | |
tree | dde815788aaea3e336aaaf24763311ce63a22e1b /sound/soc/omap/omap3evm.c | |
parent | Merge branch 'topic/beep-rename' into topic/core-change (diff) | |
parent | ALSA: Remove old DMA-mmap code from arm/devdma.c (diff) | |
download | linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.gz linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.bz2 linux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.zip |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
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 9114c263077b..13aa380de162 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -144,4 +144,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"); |