ASoC: Fix mismerge with release branch