diff options
| author | Takashi Iwai | 2015-12-23 08:33:34 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2015-12-23 08:33:34 +0100 |
| commit | 59c8231089be96165735585694a801ae58ec6c95 (patch) | |
| tree | 41bd60a9aec5df20e07a81fbb526c8bc05e997fc /include/sound | |
| parent | de5126cc3c0b0f291d08fa591dcdf237bc595a56 (diff) | |
| parent | 0fb0b822d157325b66c503d23332f64899bfb828 (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_pm.c
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hda_register.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h index 2ae8812d7b1a..94dc6a9772e0 100644 --- a/include/sound/hda_register.h +++ b/include/sound/hda_register.h @@ -93,6 +93,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; #define AZX_REG_HSW_EM4 0x100c #define AZX_REG_HSW_EM5 0x1010 +/* Skylake/Broxton display HD-A controller Extended Mode registers */ +#define AZX_REG_SKL_EM4L 0x1040 + /* PCI space */ #define AZX_PCIREG_TCSEL 0x44 |