diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-25 07:02:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-25 07:02:35 -0400 |
| commit | 2fc565e4eaf8fc633bfc741b90e1f28dba732ee1 (patch) | |
| tree | 98c994692f84aee07cf1c7b4cda245ae5235a94d /include/sound | |
| parent | 7fc7d047216aa4923d401c637be2ebc6e3d5bd9b (diff) | |
| parent | 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8 (diff) | |
Merge tag 'asoc-v3.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
A few more fixes, nothing too major though the DMA changes fix modular
builds.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index b1d1150c1d60..f11c35cd5532 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h | |||
| @@ -91,6 +91,11 @@ void snd_dmaengine_pcm_set_config_from_dai_data( | |||
| 91 | * bytes that are still left to transfer. | 91 | * bytes that are still left to transfer. |
| 92 | */ | 92 | */ |
| 93 | #define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(2) | 93 | #define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(2) |
| 94 | /* | ||
| 95 | * The PCM is half duplex and the DMA channel is shared between capture and | ||
| 96 | * playback. | ||
| 97 | */ | ||
| 98 | #define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3) | ||
| 94 | 99 | ||
| 95 | /** | 100 | /** |
| 96 | * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM | 101 | * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM |