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

Conflicts: sound/pci/hda/patch_sigmatel.c

Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
e2da9ba5 · Takashi Iwai · 127e82e3 · c39555d6 · e2da9ba5
Commit e2da9ba5 authored Nov 15, 2008 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/pci/hda/patch_sigmatel.c sound/pci/hda/patch_sigmatel.c +1 -1

No files found.
--- 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,