Skip to content

L
linux
Commit e2da9ba5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

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

Conflicts:
	sound/pci/hda/patch_sigmatel.c
parents 127e82e3 c39555d6
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sound/pci/hda/patch_sigmatel.c
View file @ e2da9ba5
...@@ -36,10 +36,10 @@ ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7