diff options
Diffstat (limited to 'sound/soc/samsung/speyside.c')
-rw-r--r-- | sound/soc/samsung/speyside.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 590e9274b06..bfed1ff7093 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c | |||
@@ -125,10 +125,6 @@ static struct snd_soc_jack_pin speyside_headset_pins[] = { | |||
125 | .pin = "Headset Mic", | 125 | .pin = "Headset Mic", |
126 | .mask = SND_JACK_MICROPHONE, | 126 | .mask = SND_JACK_MICROPHONE, |
127 | }, | 127 | }, |
128 | { | ||
129 | .pin = "Headphone", | ||
130 | .mask = SND_JACK_HEADPHONE, | ||
131 | }, | ||
132 | }; | 128 | }; |
133 | 129 | ||
134 | /* Default the headphone selection to active high */ | 130 | /* Default the headphone selection to active high */ |
@@ -252,6 +248,7 @@ static const struct snd_kcontrol_new controls[] = { | |||
252 | SOC_DAPM_PIN_SWITCH("Main AMIC"), | 248 | SOC_DAPM_PIN_SWITCH("Main AMIC"), |
253 | SOC_DAPM_PIN_SWITCH("WM1250 Input"), | 249 | SOC_DAPM_PIN_SWITCH("WM1250 Input"), |
254 | SOC_DAPM_PIN_SWITCH("WM1250 Output"), | 250 | SOC_DAPM_PIN_SWITCH("WM1250 Output"), |
251 | SOC_DAPM_PIN_SWITCH("Headphone"), | ||
255 | }; | 252 | }; |
256 | 253 | ||
257 | static struct snd_soc_dapm_widget widgets[] = { | 254 | static struct snd_soc_dapm_widget widgets[] = { |