diff options
| author | Takashi Iwai | 2018-12-13 09:10:09 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2018-12-13 09:10:42 +0100 |
| commit | c7072f5f2aa1124d57042d1d7f17521532657dc6 (patch) | |
| tree | 9f30a986f7e2bf2f9d8d859ac66b35ce6a0ea693 /sound/pci/hda/hda_controller.h | |
| parent | ALSA: fireface: add support for Fireface 800 with MIDI functionality only (diff) | |
| parent | ALSA: hda/hdmi: Always set display_power_control for Intel HSW+ codecs (diff) | |
| download | kernel-qcow2-linux-c7072f5f2aa1124d57042d1d7f17521532657dc6.tar.gz kernel-qcow2-linux-c7072f5f2aa1124d57042d1d7f17521532657dc6.tar.xz kernel-qcow2-linux-c7072f5f2aa1124d57042d1d7f17521532657dc6.zip | |
Merge branch 'topic/hda-pm-refactor' into for-next
Pull refactoring / fixes of HD-audio PM and display power management
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_controller.h')
| -rw-r--r-- | sound/pci/hda/hda_controller.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index c95097bb5a0c..7185ed574b41 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -50,11 +50,7 @@ /* 24 unused */ #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25) /* Take LPIB as delay */ #define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */ -#ifdef CONFIG_SND_HDA_I915 -#define AZX_DCAPS_I915_POWERWELL (1 << 27) /* HSW i915 powerwell support */ -#else -#define AZX_DCAPS_I915_POWERWELL 0 /* NOP */ -#endif +/* 27 unused */ #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28) /* CORBRP clears itself after reset */ #define AZX_DCAPS_NO_MSI64 (1 << 29) /* Stick to 32-bit MSIs */ #define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30) /* capture and playback use separate stream tag */ |