diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-08 11:35:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-08 11:35:14 +0100 |
| commit | bc0ba64db9bbf71f50032a786abbbee5e9a20b2c (patch) | |
| tree | 7e0da53a6f222536fbd56af2081ed220a1d8c3d5 | |
| parent | c9a235da8a61cf9af7653fca341ded0881a64eca (diff) | |
| parent | 1f85e118c81d15aa9e002604dfb69c823d4aac16 (diff) | |
| download | linux-bc0ba64db9bbf71f50032a786abbbee5e9a20b2c.tar.gz linux-bc0ba64db9bbf71f50032a786abbbee5e9a20b2c.tar.bz2 linux-bc0ba64db9bbf71f50032a786abbbee5e9a20b2c.zip | |
Merge branch 'fix/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple
| -rw-r--r-- | sound/soc/generic/Makefile | 6 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index 45602ca8536e..2d53c8d70705 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -1,5 +1,5 @@ -obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) := simple-card-utils.o - +snd-soc-simple-card-utils-objs := simple-card-utils.o snd-soc-simple-card-objs := simple-card.o -obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o +obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o +obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index d89a9a1b2471..9599de69a880 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -7,6 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/module.h> #include <linux/of.h> #include <sound/simple_card_utils.h> @@ -95,3 +96,8 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, return 0; } EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name); + +/* Module information */ +MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>"); +MODULE_DESCRIPTION("ALSA SoC Simple Card Utils"); +MODULE_LICENSE("GPL v2"); |