diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-11-28 18:30:19 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-28 18:30:19 +0100 |
commit | 50314663877b3c5f08b2573c0bb161b6a2c63c3e (patch) | |
tree | eda596ffce10fae670168e2d7aa797f5a1b0a2a7 /include/sound/pcm.h | |
parent | 6874daad4b0fbed5b2f9bef7f4d3f2b895463a95 (diff) | |
parent | d42472ecffd7c42086c6e5b1335c99a3adf58a09 (diff) | |
download | op-kernel-dev-50314663877b3c5f08b2573c0bb161b6a2c63c3e.zip op-kernel-dev-50314663877b3c5f08b2573c0bb161b6a2c63c3e.tar.gz |
Merge branch 'for-linus' into for-next
The commit [7a2e9ddc: ALSA: usb-audio: Add native DSD support for
Denon/Marantz DACs] requires the new format definition that has
landed only in for-next branch.
Diffstat (limited to 'include/sound/pcm.h')
-rw-r--r-- | include/sound/pcm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 40289ec..1e7f74a 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -184,6 +184,8 @@ struct snd_pcm_ops { #define SNDRV_PCM_FMTBIT_DSD_U8 _SNDRV_PCM_FMTBIT(DSD_U8) #define SNDRV_PCM_FMTBIT_DSD_U16_LE _SNDRV_PCM_FMTBIT(DSD_U16_LE) #define SNDRV_PCM_FMTBIT_DSD_U32_LE _SNDRV_PCM_FMTBIT(DSD_U32_LE) +#define SNDRV_PCM_FMTBIT_DSD_U16_BE _SNDRV_PCM_FMTBIT(DSD_U16_BE) +#define SNDRV_PCM_FMTBIT_DSD_U32_BE _SNDRV_PCM_FMTBIT(DSD_U32_BE) #ifdef SNDRV_LITTLE_ENDIAN #define SNDRV_PCM_FMTBIT_S16 SNDRV_PCM_FMTBIT_S16_LE |