Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32

1 files changed, 3 insertions, 2 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 50c6a0e295b7..97ca9af414dc 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);
 
         /*