Merge branch 'for-next' into for-linus

[mirror_ubuntu-artful-kernel.git] / sound / pci / hda / hda_generic.c

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 79c7b340acc2361518b51504b7ecb032a71991b2..e7c8f4f076d5f3297946b088bc31cf7ecc0d66ad 100644 (file)
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2492,10 +2492,6 @@ static int create_loopback_mixing_ctl(struct hda_codec *codec)
        if (!snd_hda_gen_add_kctl(spec, NULL, &loopback_mixing_enum))
                return -ENOMEM;
        spec->have_aamix_ctl = 1;
-       /* if no explicit aamix path is present (e.g. for Realtek codecs),
-        * enable aamix as default -- just for compatibility
-        */
-       spec->aamix_mode = !has_aamix_out_paths(spec);
        return 0;
 }