From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 15 Nov 2008 18:05:21 +0000 (+0100)
Subject: Merge branch 'topic/fix/hda' into topic/hda
X-Git-Tag: v2.6.29-rc1~590^2~6^2~95
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e2da9ba570418fb4061f0a5cfe4338be6470c02b;p=linux-2.6-omap-h63xx.git

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

Conflicts:
	sound/pci/hda/patch_sigmatel.c
---

e2da9ba570418fb4061f0a5cfe4338be6470c02b
diff --cc sound/pci/hda/patch_sigmatel.c
index 66c12d3e9c7,f205570def1..6d9c634632d
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -36,6 -35,9 +36,7 @@@
  #include "hda_patch.h"
  #include "hda_beep.h"
  
 -#define NUM_CONTROL_ALLOC	32
 -
+ #define STAC_VREF_EVENT		0x00
  #define STAC_INSERT_EVENT	0x10
  #define STAC_PWR_EVENT		0x20
  #define STAC_HP_EVENT		0x30