From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 10 May 2010 15:24:03 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v2.6.35-rc1~478^2~1^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5433137336b049f1de8fc9a393991a49f1c1eb66;p=users%2Fdwmw2%2Flinux.git

Merge branch 'fix/hda' into topic/hda
---

5433137336b049f1de8fc9a393991a49f1c1eb66
diff --cc sound/pci/hda/patch_conexant.c
index 0aa122e26dc80,d8213e2231a6b..c8e83f5071649
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@@ -2973,8 -2846,8 +2973,9 @@@ static struct snd_pci_quirk cxt5066_cfg
  	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),
 +	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
  	{}
  };