From 27e2ab9d4fc73e1acf69a2fa77f576a4aa1ad6f8 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sun, 4 Sep 2011 07:54:55 -0700 Subject: [PATCH] --- yaml --- r: 270596 b: refs/heads/master c: 45cf367e8058ff3f1f6f9c3e9f617bfd7cff65b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/speyside.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d48397c524a..7ed1c0ad943e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b684cc14a791accdd6d97cb68242ab5009ece3e +refs/heads/master: 45cf367e8058ff3f1f6f9c3e9f617bfd7cff65b1 diff --git a/trunk/sound/soc/samsung/speyside.c b/trunk/sound/soc/samsung/speyside.c index 09df8afbb447..b9e213f6cc06 100644 --- a/trunk/sound/soc/samsung/speyside.c +++ b/trunk/sound/soc/samsung/speyside.c @@ -167,7 +167,8 @@ static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd) gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity); ret = snd_soc_jack_new(codec, "Headset", - SND_JACK_HEADSET | SND_JACK_BTN_0, + SND_JACK_LINEOUT | SND_JACK_HEADSET | + SND_JACK_BTN_0, &speyside_headset); if (ret) return ret;