diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-15 17:27:19 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-15 17:28:43 +0400 |
| commit | 1618e84aa87af94b46921b265b68bb7994571c20 (patch) | |
| tree | 0ee428edbcd6e1a49abe72767850997e6adfec1c /sound/pci/hda/hda_priv.h | |
| parent | 03fe805a098422d27cbbbad29a54ff1349da3622 (diff) | |
| parent | 4da63c6fc426023d1a20e45508c47d7d68c6a53d (diff) | |
| download | linux-1618e84aa87af94b46921b265b68bb7994571c20.tar.xz | |
Merge branch 'for-linus' into for-next
Since init_failed flag was moved to struct hda_intel, its access in
the commit [4da63c6f: ALSA: hda - Fix broken PM due to incomplete
i915 initialization] is also replaced with hda->init_failed
appropriately.
Diffstat (limited to 'sound/pci/hda/hda_priv.h')
| -rw-r--r-- | sound/pci/hda/hda_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_priv.h b/sound/pci/hda/hda_priv.h index 33eb5d027d38..949cd437eeb2 100644 --- a/sound/pci/hda/hda_priv.h +++ b/sound/pci/hda/hda_priv.h @@ -166,6 +166,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; #define AZX_DCAPS_BUFSIZE (1 << 21) /* no buffer size alignment */ #define AZX_DCAPS_ALIGN_BUFSIZE (1 << 22) /* buffer size alignment */ #define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23) /* BDLE in 4k boundary */ +#define AZX_DCAPS_REVERSE_ASSIGN (1 << 24) /* Assign devices in reverse order */ #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25) /* Take LPIB as delay */ #define AZX_DCAPS_PM_RUNTIME (1 << 26) /* runtime PM support */ #define AZX_DCAPS_I915_POWERWELL (1 << 27) /* HSW i915 powerwell support */ |