Commit 74b33b84 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/component' of... 

Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
parents 9900a422 840bc448

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,8 @@ int snd_soc_component_set_sysclk(struct snd_soc_component *component, 
int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id,

			      int source, unsigned int freq_in,

			      unsigned int freq_out);

int snd_soc_component_set_jack(struct snd_soc_component *component,

			       struct snd_soc_jack *jack, void *data);



#ifdef CONFIG_REGMAP