diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 16:38:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 16:38:26 +0100 |
| commit | 305787649826d6c84a6f9f71bc3318460610aba4 (patch) | |
| tree | b36cfe60e6f806414b1e6c042f0be233f114986f /sound/soc/omap/omap3pandora.c | |
| parent | c4806174c516d26bf4a72db1789cfc96e4950d07 (diff) | |
| parent | aeb29a82de7c80d4d0253b042f17eb1f725b08f1 (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35
Diffstat (limited to 'sound/soc/omap/omap3pandora.c')
| -rw-r--r-- | sound/soc/omap/omap3pandora.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index de10f76baded..87ce842fa2e8 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -188,8 +188,6 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec) int ret; /* All TWL4030 output pins are floating */ - snd_soc_dapm_nc_pin(codec, "OUTL"); - snd_soc_dapm_nc_pin(codec, "OUTR"); snd_soc_dapm_nc_pin(codec, "EARPIECE"); snd_soc_dapm_nc_pin(codec, "PREDRIVEL"); snd_soc_dapm_nc_pin(codec, "PREDRIVER"); |