From: Peter Rosin <peda@axentia.se>
Date: Thu, 27 Nov 2014 21:02:42 +0000 (+0100)
Subject: ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing
X-Git-Tag: omap-for-v3.19/fixes-rc1~126^2~20^2~25^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8781db8aeb18d34edb191bfed9c0a68affaaa74;p=pandora-kernel.git

ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing

If a snd_soc_card has any DAPM routes when it calls
snd_soc_of_parse_audio_routing, those are clobbered without this change.

Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

Reading git-diff-tree failed