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>