projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1965c44 482c453)
Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 15:24:03 +0000 (17:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 15:24:03 +0000 (17:24 +0200)
1  2 
sound/pci/hda/patch_conexant.c patch | diff1 | diff2 | blob | history
sound/pci/hda/patch_realtek.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/hda/patch_conexant.c
index 0aa122e26dc8054328400beb3c4a23f1e84e3166,d8213e2231a6b3ceb157b092037d00cc8757767e..c8e83f50716490f17a3d53893c74a22f117ab73d
--- 1/sound/pci/hda/patch_conexant.c
--- 2/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),
        {}
  };
  
diff --cc sound/pci/hda/patch_realtek.c
Simple merge