summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/adav80x.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-09-22 09:56:12 +0200
committerTakashi Iwai <tiwai@suse.de>2011-09-22 09:56:12 +0200
commitaf1910a817c5ad52c32dddacc1744cfa1b35889e (patch)
tree2d6504a2ac5971bb84e0172bbdd309b781048849 /sound/soc/codecs/adav80x.c
parent5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff)
parentf648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff)
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'sound/soc/codecs/adav80x.c')
-rw-r--r--sound/soc/codecs/adav80x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index 300c04b70e71..f9f08948e5e8 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -523,7 +523,8 @@ static int adav80x_hw_params(struct snd_pcm_substream *substream,
}
static int adav80x_set_sysclk(struct snd_soc_codec *codec,
- int clk_id, unsigned int freq, int dir)
+ int clk_id, int source,
+ unsigned int freq, int dir)
{
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);