diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-06 17:06:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-06 17:06:27 +0200 |
| commit | aeb29a82de7c80d4d0253b042f17eb1f725b08f1 (patch) | |
| tree | f15ba557a22b010cd790ead5a3c4a4a9872fe58f /sound/soc/omap/zoom2.c | |
| parent | 39b8eab7e7fe429d8d57f18c0ebdb7c25df55f5c (diff) | |
| parent | 2f005471e2e2f2c7fa5898153387d421f7d24ad6 (diff) | |
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/omap/zoom2.c')
| -rw-r--r-- | sound/soc/omap/zoom2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index f90a2ac888c..50a94ee76ec 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -181,9 +181,6 @@ static int zoom2_twl4030_init(struct snd_soc_codec *codec) snd_soc_dapm_nc_pin(codec, "CARKITMIC"); snd_soc_dapm_nc_pin(codec, "DIGIMIC0"); snd_soc_dapm_nc_pin(codec, "DIGIMIC1"); - - 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"); |