diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-12 08:10:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-12 08:10:20 +0200 |
| commit | cc1b76ed32607ba378986931e73b64231085816f (patch) | |
| tree | 2554500c3e743249afafd1857a3956aae1b2220e /include | |
| parent | ALSA: HDA: remove the unused function declaration (diff) | |
| parent | ALSA: hda - Abort the probe without i915 binding for HSW/BDW (diff) | |
| download | linux-cc1b76ed32607ba378986931e73b64231085816f.tar.xz linux-cc1b76ed32607ba378986931e73b64231085816f.zip | |
Merge branch 'for-linus' into for-next
Yet another non-trivial conflicts resolution for the recent HD-audio fix.
Conflicts:
sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/hda_regmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/hda_regmap.h b/include/sound/hda_regmap.h index 53a18b3635e2..df705908480a 100644 --- a/include/sound/hda_regmap.h +++ b/include/sound/hda_regmap.h @@ -9,6 +9,8 @@ #include <sound/core.h> #include <sound/hdaudio.h> +#define AC_AMP_FAKE_MUTE 0x10 /* fake mute bit set to amp verbs */ + int snd_hdac_regmap_init(struct hdac_device *codec); void snd_hdac_regmap_exit(struct hdac_device *codec); int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec, |