aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-15 13:05:21 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-15 13:05:21 -0500
commite2da9ba570418fb4061f0a5cfe4338be6470c02b (patch)
treeabdee28e90a5a911d0762286d729ea7f7d3cb65b /sound
parent127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f (diff)
parentc39555d6edd0142972f577405d5259879ecc1635 (diff)
Merge branch 'topic/fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c2
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 @@
36#include "hda_patch.h" 36#include "hda_patch.h"
37#include "hda_beep.h" 37#include "hda_beep.h"
38 38
39#define STAC_VREF_EVENT 0x00
39#define STAC_INSERT_EVENT 0x10 40#define STAC_INSERT_EVENT 0x10
40#define STAC_PWR_EVENT 0x20 41#define STAC_PWR_EVENT 0x20
41#define STAC_HP_EVENT 0x30 42#define STAC_HP_EVENT 0x30
42#define STAC_VREF_EVENT 0x40
43 43
44enum { 44enum {
45 STAC_REF, 45 STAC_REF,