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

Conflicts:
	sound/pci/hda/patch_sigmatel.c

diff --cc sound/pci/hda/patch_sigmatel.c
index 66c12d3,f205570..6d9c634
--- 1/sound/pci/hda/patch_sigmatel.c
--- 2/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