ASoC: Fix up merge with the ARM tree