diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-06-26 15:49:20 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-06-26 15:49:20 +0200 |
commit | 7e9c2eb62642680e331d91453f94c0073580a1b1 (patch) | |
tree | 9c81282f509dc28a68c15a03033a0e71dd672912 /sound/pci/hda/hda_local.h | |
parent | ALSA: hda - Remove the obsoleted static quirk codes from patch_cmedia.c (diff) | |
parent | ALSA: hda - restore BCLK M/N values when resuming HSW/BDW display controller (diff) | |
download | linux-7e9c2eb62642680e331d91453f94c0073580a1b1.tar.xz linux-7e9c2eb62642680e331d91453f94c0073580a1b1.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index d52cc3ef5135..aa374ad4b5d0 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -418,6 +418,27 @@ struct snd_hda_pin_quirk { int value; /* quirk value */ }; +#ifdef CONFIG_SND_DEBUG_VERBOSE + +#define SND_HDA_PIN_QUIRK(_codec, _subvendor, _name, _value, _pins...) \ + { .codec = _codec,\ + .subvendor = _subvendor,\ + .name = _name,\ + .value = _value,\ + .pins = (const struct hda_pintbl[]) { _pins } \ + } +#else + +#define SND_HDA_PIN_QUIRK(_codec, _subvendor, _name, _value, _pins...) \ + { .codec = _codec,\ + .subvendor = _subvendor,\ + .value = _value,\ + .pins = (const struct hda_pintbl[]) { _pins } \ + } + +#endif + + /* fixup types */ enum { HDA_FIXUP_INVALID, |