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 /sound/core/pcm.c | |
| parent | 6874daad4b0fbed5b2f9bef7f4d3f2b895463a95 (diff) | |
| parent | d42472ecffd7c42086c6e5b1335c99a3adf58a09 (diff) | |
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 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 8f624b7af0ca..cfc56c806964 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -216,6 +216,8 @@ static char *snd_pcm_format_names[] = { FORMAT(DSD_U8), FORMAT(DSD_U16_LE), FORMAT(DSD_U32_LE), + FORMAT(DSD_U16_BE), + FORMAT(DSD_U32_BE), }; /** |