Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2da9ba5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

Conflicts:
	sound/pci/hda/patch_sigmatel.c
parents 127e82e3 c39555d6

sound/pci/hda/patch_sigmatel.c

+1 −1
Original line number Diff line number Diff line
@@ -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,