Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263379
b: refs/heads/master
c: ee1a4d4
h: refs/heads/master
i:
  263377: 046d46e
  263375: 17e6b5c
v: v3
  • Loading branch information
Stephen Warren authored and Mark Brown committed Aug 24, 2011
1 parent 73360ba commit e81f506
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 250b68512dd7e7d31a8c85a740a4b085bade4ba0
refs/heads/master: ee1a4d4b7fcfce31dade9f2ad333b34159cee799
4 changes: 2 additions & 2 deletions trunk/sound/soc/tegra/tegra_wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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()) {
Expand Down

0 comments on commit e81f506

Please sign in to comment.