Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c
This commit is contained in:
Takashi Iwai
2010-01-19 15:53:43 +01:00
833 changed files with 15847 additions and 8073 deletions

View File

@@ -1276,6 +1276,8 @@ static int patch_ad1986a(struct hda_codec *codec)
*/
spec->multiout.no_share_stream = 1;
codec->no_trigger_sense = 1;
return 0;
}
@@ -1461,6 +1463,8 @@ static int patch_ad1983(struct hda_codec *codec)
codec->patch_ops = ad198x_patch_ops;
codec->no_trigger_sense = 1;
return 0;
}
@@ -1904,6 +1908,9 @@ static int patch_ad1981(struct hda_codec *codec)
codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
break;
}
codec->no_trigger_sense = 1;
return 0;
}
@@ -3211,6 +3218,8 @@ static int patch_ad1988(struct hda_codec *codec)
#endif
spec->vmaster_nid = 0x04;
codec->no_trigger_sense = 1;
return 0;
}
@@ -3423,6 +3432,8 @@ static int patch_ad1884(struct hda_codec *codec)
codec->patch_ops = ad198x_patch_ops;
codec->no_trigger_sense = 1;
return 0;
}
@@ -4383,6 +4394,8 @@ static int patch_ad1884a(struct hda_codec *codec)
break;
}
codec->no_trigger_sense = 1;
return 0;
}
@@ -4719,6 +4732,9 @@ static int patch_ad1882(struct hda_codec *codec)
spec->mixers[2] = ad1882_6stack_mixers;
break;
}
codec->no_trigger_sense = 1;
return 0;
}