From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 19 Dec 2008 07:22:57 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v2.6.29-rc1~590^2~6^2~15
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0ff555192a8d20385d49d1c420e2e8d409b3c0da;p=linux-2.6-omap-h63xx.git

Merge branch 'fix/hda' into topic/hda
---

0ff555192a8d20385d49d1c420e2e8d409b3c0da
diff --cc sound/pci/hda/patch_sigmatel.c
index 4c851fd5556,d7c622f944f..71c3ccfcde1
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -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;
  }