From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Jan 2020 10:44:35 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v5.6-rc1~150^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d0af44c2ed036c663832f3b764ffd1109c8b79e;p=linux.git

Merge branch 'for-linus' into for-next

Resolved the merge conflict in HD-audio Tegra driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

9d0af44c2ed036c663832f3b764ffd1109c8b79e
diff --cc sound/pci/hda/hda_tegra.c
index 567c9ebddb2e,e5191584638a..773992a07efa
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@@ -394,7 -397,8 +394,8 @@@ static int hda_tegra_create(struct snd_
  	if (err < 0)
  		return err;
  
 -	chip->bus.needs_damn_long_delay = 1;
 +	chip->bus.core.needs_damn_long_delay = 1;
+ 	chip->bus.core.aligned_mmio = 1;
  
  	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
  	if (err < 0) {