diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
commit | 26b9b559ed9ff3bef5642ef731748d28d894705f (patch) | |
tree | 9145782f06f68f88c004828d5f85d8d772d1cde6 /sound/soc/tegra/tegra_wm8903.c | |
parent | ALSA: hda: Conexant: Allow different output types to share DAC (diff) | |
parent | ASoC: Correct element count for WM8996 sidetone HPF (diff) | |
download | linux-dev-26b9b559ed9ff3bef5642ef731748d28d894705f.tar.xz linux-dev-26b9b559ed9ff3bef5642ef731748d28d894705f.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
-rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 661373c2352a..be27f1d229af 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -319,7 +319,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); /* FIXME: Calculate automatically based on DAPM routes? */ - if (!machine_is_harmony() && !machine_is_ventana()) + if (!machine_is_harmony()) snd_soc_dapm_nc_pin(dapm, "IN1L"); if (!machine_is_seaboard() && !machine_is_aebl()) snd_soc_dapm_nc_pin(dapm, "IN1R"); @@ -395,7 +395,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); - if (machine_is_harmony() || machine_is_ventana()) { + if (machine_is_harmony()) { card->dapm_routes = harmony_audio_map; card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map); } else if (machine_is_seaboard()) { |