From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 6 May 2010 06:39:43 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.12-rc1~10283^2~1^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20d157aef2e5bc6ac8995e8babefdc6e1cfaaadf;p=kernel%2Fkernel-generic.git

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

20d157aef2e5bc6ac8995e8babefdc6e1cfaaadf
diff --cc sound/pci/hda/patch_conexant.c
index 509a104,56e5207..114af8e
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@@ -2967,8 -2843,10 +2968,11 @@@ static struct snd_pci_quirk cxt5066_cfg
  		      CXT5066_DELL_LAPTOP),
  	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
  	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),
+ 	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, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
 +	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
  	{}
  };