From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 28 Nov 2014 17:30:19 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50314663877b3c5f08b2573c0bb161b6a2c63c3e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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.
---

50314663877b3c5f08b2573c0bb161b6a2c63c3e
diff --cc sound/core/pcm.c
index 8f624b7af0ca,c6ff94ab1ad6..cfc56c806964
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@@ -216,12 -216,10 +216,14 @@@ 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),
  };
  
 +/**
 + * snd_pcm_format_name - Return a name string for the given PCM format
 + * @format: PCM format
 + */
  const char *snd_pcm_format_name(snd_pcm_format_t format)
  {
  	if ((__force unsigned int)format >= ARRAY_SIZE(snd_pcm_format_names))