Merge branch 'fix/asoc' into for-linus

* fix/asoc:
ASoC: Add missing DRV_NAME definitions for fsl/* drivers

+4
+2
sound/soc/fsl/efika-audio-fabric.c
··· 30 30 #include "mpc5200_psc_ac97.h" 31 31 #include "../codecs/stac9766.h" 32 32 33 + #define DRV_NAME "efika-audio-fabric" 34 + 33 35 static struct snd_soc_device device; 34 36 static struct snd_soc_card card; 35 37
+2
sound/soc/fsl/pcm030-audio-fabric.c
··· 30 30 #include "mpc5200_psc_ac97.h" 31 31 #include "../codecs/wm9712.h" 32 32 33 + #define DRV_NAME "pcm030-audio-fabric" 34 + 33 35 static struct snd_soc_device device; 34 36 static struct snd_soc_card card; 35 37