diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 06:33:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 06:33:09 -0400 |
| commit | 69dd89fd2b9406603d218cab8996cfb232d5b8b9 (patch) | |
| tree | 467a65877d0c550ae7c937bc658abd313958122f /include/sound | |
| parent | 8c1d843460f42417d6b9553147a1a04ca1470602 (diff) | |
| parent | c159a85013afbb8283f0c7272812952e04d5c3a1 (diff) | |
Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final updates for v3.15 merge window
A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 2f66d5e8cd15..fad76769f153 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
| @@ -142,7 +142,7 @@ struct snd_soc_dai_ops { | |||
| 142 | * Called by soc_card drivers, normally in their hw_params. | 142 | * Called by soc_card drivers, normally in their hw_params. |
| 143 | */ | 143 | */ |
| 144 | int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); | 144 | int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); |
| 145 | int (*of_xlate_tdm_slot_mask)(unsigned int slots, | 145 | int (*xlate_tdm_slot_mask)(unsigned int slots, |
| 146 | unsigned int *tx_mask, unsigned int *rx_mask); | 146 | unsigned int *tx_mask, unsigned int *rx_mask); |
| 147 | int (*set_tdm_slot)(struct snd_soc_dai *dai, | 147 | int (*set_tdm_slot)(struct snd_soc_dai *dai, |
| 148 | unsigned int tx_mask, unsigned int rx_mask, | 148 | unsigned int tx_mask, unsigned int rx_mask, |