Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 e2da9ba5 编写于 作者: T Takashi Iwai
浏览文件
操作

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

Conflicts:
	sound/pci/hda/patch_sigmatel.c
上级 127e82e3 c39555d6
隐藏空白更改
内联 并排
Showing with 1 addition and 1 deletion
sound/pci/hda/patch_sigmatel.c
浏览文件 @ 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% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或