diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-11 13:09:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-11 13:09:27 +0100 |
| commit | 1921bab217c2c21e4b8dc78332f6ae11515fc014 (patch) | |
| tree | 0577922c34d491b34c6a5aa47dab950c073ada12 /include | |
| parent | 17244c24f95ba61a12b6afeab5780a1e3f1a4c57 (diff) | |
| parent | a5479e389e989acfeca9c32eeb0083d086202280 (diff) | |
Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 50c6a0e295b..97ca9af414d 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -112,7 +112,7 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt); int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, - unsigned int mask, int slots); + unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width); int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); @@ -146,7 +146,8 @@ struct snd_soc_dai_ops { */ int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); int (*set_tdm_slot)(struct snd_soc_dai *dai, - unsigned int mask, int slots); + unsigned int tx_mask, unsigned int rx_mask, + int slots, int slot_width); int (*set_tristate)(struct snd_soc_dai *dai, int tristate); /* |