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

Commit 1b9f1ae8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/samsung' and 'asoc/topic/wm8750' into asoc-next

parents 7e00880e 03da09a0 a380acb8

sound/soc/codecs/wm8750.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = { 
	SND_SOC_DAPM_OUTPUT("ROUT2"),

	SND_SOC_DAPM_OUTPUT("MONO1"),

	SND_SOC_DAPM_OUTPUT("OUT3"),

	SND_SOC_DAPM_OUTPUT("VREF"),

	SND_SOC_DAPM_VMID("VREF"),



	SND_SOC_DAPM_INPUT("LINPUT1"),

	SND_SOC_DAPM_INPUT("LINPUT2"),

sound/soc/samsung/arndale_rt5631.c

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ MODULE_DEVICE_TABLE(of, samsung_arndale_rt5631_of_match); 
static struct platform_driver arndale_audio_driver = {

	.driver = {

		.name   = "arndale-audio",

		.owner  = THIS_MODULE,

		.pm = &snd_soc_pm_ops,

		.of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),

	},