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

Conflicts:
	sound/pci/hda/patch_sigmatel.c

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 66c12d3e9c79..6d9c634632d4 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -36,10 +36,10 @@
 #include "hda_patch.h"
 #include "hda_beep.h"
 
+#define STAC_VREF_EVENT         0x00
 #define STAC_INSERT_EVENT       0x10
 #define STAC_PWR_EVENT          0x20
 #define STAC_HP_EVENT           0x30
-#define STAC_VREF_EVENT         0x40
 
 enum {
         STAC_REF,