Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	sound/pci/hda/patch_sigmatel.c
This commit is contained in:
Takashi Iwai 2008-11-15 19:05:21 +01:00
commit e2da9ba570
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/patch_sigmatel.c
View File

@ -36,10 +36,10 @@
#include "hda_patch.h" #include "hda_patch.h"
#include "hda_beep.h" #include "hda_beep.h"
#define STAC_VREF_EVENT 0x00
#define STAC_INSERT_EVENT 0x10 #define STAC_INSERT_EVENT 0x10
#define STAC_PWR_EVENT 0x20 #define STAC_PWR_EVENT 0x20
#define STAC_HP_EVENT 0x30 #define STAC_HP_EVENT 0x30
#define STAC_VREF_EVENT 0x40
enum { enum {
STAC_REF, STAC_REF,