Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[cascardo/linux.git] / include / sound / soc-dai.h

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 688f2ba..e8b3080 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -257,7 +257,6 @@ struct snd_soc_dai {
 
        struct snd_soc_dapm_widget *playback_widget;
        struct snd_soc_dapm_widget *capture_widget;
-       struct snd_soc_dapm_context dapm;
 
        /* DAI DMA data */
        void *playback_dma_data;
@@ -273,6 +272,10 @@ struct snd_soc_dai {
        struct snd_soc_codec *codec;
        struct snd_soc_component *component;
 
+       /* CODEC TDM slot masks and params (for fixup) */
+       unsigned int tx_mask;
+       unsigned int rx_mask;
+
        struct snd_soc_card *card;
 
        struct list_head list;