Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94b849aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard"
  ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec
  ALSA: hda - fix DG45ID SPDIF output
parents f7422464 482c4533

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -2846,6 +2846,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),

	{}

};

sound/pci/hda/patch_realtek.c

+0 −1
Original line number Diff line number Diff line
@@ -17871,7 +17871,6 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { 
					ALC662_3ST_6ch_DIG),

	SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",

			   ALC663_ASUS_H13),

	SND_PCI_QUIRK(0x8086, 0xd604, "Intel mobo", ALC662_3ST_2ch_DIG),

	{}

};

























sound/pci/hda/patch_sigmatel.c



+2
−4




























Original line number
Diff line number
Diff line








@@ -1544,11 +1544,9 @@ static unsigned int alienware_m17x_pin_configs[13] = {













	0x904601b0,















};





























static unsigned int intel_dg45id_pin_configs[14] = {













static unsigned int intel_dg45id_pin_configs[13] = {















	0x02214230, 0x02A19240, 0x01013214, 0x01014210,













	0x01A19250, 0x01011212, 0x01016211, 0x40f000f0,













	0x40f000f0, 0x40f000f0, 0x40f000f0, 0x014510A0,













	0x074510B0, 0x40f000f0













	0x01A19250, 0x01011212, 0x01016211















};































static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {