| commit | e2da9ba570418fb4061f0a5cfe4338be6470c02b | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sat Nov 15 19:05:21 2008 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Sat Nov 15 19:05:21 2008 +0100 |
| tree | abdee28e90a5a911d0762286d729ea7f7d3cb65b | |
| parent | 127e82e3bfaad29e78ff5d4b1c41ab5e2d69c17f [diff] | |
| parent | c39555d6edd0142972f577405d5259879ecc1635 [diff] |
Merge branch 'topic/fix/hda' into topic/hda Conflicts: sound/pci/hda/patch_sigmatel.c
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 66c12d3e..6d9c634 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,