diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-04 13:57:34 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-04 13:57:34 -0400 |
| commit | 68d114e1c68c25b383e917d5b979e52f481ad4bb (patch) | |
| tree | e5d4e5c0b5c00ce2d3b1949a36f0d1b032a1a28e /sound/soc/omap/omap-abe-twl6040.c | |
| parent | 07ac2296fb24e40ba8271a08167b588f4bbbe90c (diff) | |
| parent | b764de2d8bafff3a52aa6ee66cedf435486974f4 (diff) | |
Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index be525dfe9faa..750d595d01d7 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c | |||
| @@ -220,7 +220,7 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) | |||
| 220 | twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); | 220 | twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); |
| 221 | twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); | 221 | twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); |
| 222 | twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); | 222 | twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); |
| 223 | twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator"); | 223 | twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vibrator"); |
| 224 | twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); | 224 | twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); |
| 225 | twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); | 225 | twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); |
| 226 | twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); | 226 | twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); |