← Back to branch summary

~diwic/sound-2.6/filtered

« back to all changes in this revision

Viewing changes to soc/tegra/tegra_wm8903.c

  • Committer: Takashi Iwai
  • Date: 2011-08-25 12:06:51 UTC
  • mfrom: (2927.505.93)
  • Revision ID: git-v1:cb118343ab28b506057b6d248dfbf25d34fddcf4
Merge branch 'topic/asoc'

Show diffs side-by-side

added added

removed removed

Lines of Context:
soc/tegra/tegra_wm8903.c
319
319
        snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
320
320
 
321
321
        /* FIXME: Calculate automatically based on DAPM routes? */
322
 
        if (!machine_is_harmony() && !machine_is_ventana())
 
322
        if (!machine_is_harmony())
323
323
                snd_soc_dapm_nc_pin(dapm, "IN1L");
324
324
        if (!machine_is_seaboard() && !machine_is_aebl())
325
325
                snd_soc_dapm_nc_pin(dapm, "IN1R");
395
395
        platform_set_drvdata(pdev, card);
396
396
        snd_soc_card_set_drvdata(card, machine);
397
397
 
398
 
        if (machine_is_harmony() || machine_is_ventana()) {
 
398
        if (machine_is_harmony()) {
399
399
                card->dapm_routes = harmony_audio_map;
400
400
                card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);
401
401
        } else if (machine_is_seaboard()) {