diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 13:58:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 13:58:23 +0000 |
| commit | 3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch) | |
| tree | 708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/samsung/rx1950_uda1380.c | |
| parent | ASoC: sh: fsi-ak4642: fixup platform device id (diff) | |
| parent | ASoC: documentation updates (diff) | |
| download | wireguard-linux-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.xz wireguard-linux-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/samsung/rx1950_uda1380.c')
| -rw-r--r-- | sound/soc/samsung/rx1950_uda1380.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c index 5f2479ce9dde..1e574a5d440d 100644 --- a/sound/soc/samsung/rx1950_uda1380.c +++ b/sound/soc/samsung/rx1950_uda1380.c @@ -235,6 +235,7 @@ static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin(dapm, "Speaker"); + snd_soc_dapm_enable_pin(dapm, "Mic Jack"); snd_soc_dapm_sync(dapm); |