Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf3383fb authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents 0c8e2917 064d58ee

sound/soc/blackfin/bf5xx-ad1836.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { 
		.cpu_dai_name = "bfin-tdm.0",

		.codec_dai_name = "ad1836-hifi",

		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "ad1836.0",

		.codec_name = "spi0.4",

		.ops = &bf5xx_ad1836_ops,

	},

	{
@@ -84,7 +84,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { 
		.cpu_dai_name = "bfin-tdm.1",

		.codec_dai_name = "ad1836-hifi",

		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "ad1836.0",

		.codec_name = "spi0.4",

		.ops = &bf5xx_ad1836_ops,

	},

};