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

Merge branch 'fix/simple' of... 

Merge branch 'fix/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple
parents c9a235da 1f85e118

sound/soc/generic/Makefile

+3 −3
Original line number Diff line number Diff line 
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_UTILS)	+= snd-soc-simple-card-utils.o

obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o

sound/soc/generic/simple-card-utils.c

+6 −0
Original line number Diff line number Diff line
@@ -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");