From c5cc812e241bcfde0ba0ae357f07af0256b029a1 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 12 Aug 2009 14:30:33 +0100 Subject: [PATCH] --- yaml --- r: 157637 b: refs/heads/master c: d2a382143b35a486b8089861790d6b3ec4e46932 h: refs/heads/master i: 157635: 3383a7fd0973acbda106da5934dc8c9987620bc7 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ad1938.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 44e30c746c13..9fe0ba20feef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0026beac0f1a6253488478b3f022ff243b012b9 +refs/heads/master: d2a382143b35a486b8089861790d6b3ec4e46932 diff --git a/trunk/sound/soc/codecs/ad1938.c b/trunk/sound/soc/codecs/ad1938.c index aafda743fc8f..2ffb1af152b3 100644 --- a/trunk/sound/soc/codecs/ad1938.c +++ b/trunk/sound/soc/codecs/ad1938.c @@ -133,8 +133,8 @@ static inline int ad1938_pll_powerctrl(struct snd_soc_codec *codec, int cmd) return 0; } -static int ad1938_set_tdm_slot(struct snd_soc_dai *dai, - unsigned int mask, int slots) +static int ad1938_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, + unsigned int mask, int slots, int width) { struct snd_soc_codec *codec = dai->codec; int dac_reg = codec->read(codec, AD1938_DAC_CTRL1);