Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 169d5a83 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Fix mismerge with release branch 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 65fdd5c0

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ struct snd_soc_dapm_path { 
	/* status */

	u32 connect:1;	/* source and sink widgets are connected */

	u32 walked:1;	/* path has been walked */

	u32 weak:1;	/* path ignored for power management */



	int (*connected)(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink);