Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next

This commit is contained in:
Mark Brown 2012-12-10 00:21:42 +09:00
commit deb6779fc5

View File

@ -2356,7 +2356,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
return 0; return 0;
} }
struct snd_soc_dai_driver ab8500_codec_dai[] = { static struct snd_soc_dai_driver ab8500_codec_dai[] = {
{ {
.name = "ab8500-codec-dai.0", .name = "ab8500-codec-dai.0",
.id = 0, .id = 0,