Re: [alsa-devel] [PATCHv2 6/8] ASoC: fsl: add SGTL5000 based audio machine driver.

...

Conflicts: sound/soc/fsl/Makefile

Ahem.

This will be removed.

...

+static int fsl_sgtl5000_remove(struct platform_device *pdev) {

• snd_soc_unregister_card(&fsl_sgt1500_card);
• return 0;

+}

You're using snd_soc_unregister_card() so you don't need to do this.

See the next version.