]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 07:22:57 +0000 (08:22 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 07:22:57 +0000 (08:22 +0100)
1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
include/linux/input.h
sound/core/jack.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_sigmatel.c

Simple merge
Simple merge
Simple merge
index 4c851fd5556505431a3d31827bcddd8366272682,d7c622f944f6f393e7ba55c42653b28f2698e6f7..71c3ccfcde167338047c049b857024bac1dc1a59
@@@ -4642,10 -4361,11 +4652,13 @@@ again
                return err;
        }
  
+       if (spec->board_config == STAC_92HD73XX_NO_JD)
+               spec->hp_detect = 0;
        codec->patch_ops = stac92xx_patch_ops;
  
 +      codec->proc_widget_hook = stac92hd7x_proc_hook;
 +
        return 0;
  }