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

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

View File

@ -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,