Merge branch 'fix/hda' into for-linus
Takashi Iwai [Tue, 15 Dec 2009 09:33:51 +0000 (10:33 +0100)]
1  2 
sound/pci/hda/patch_realtek.c

@@@ -6248,6 -6248,7 +6248,7 @@@ static const char *alc260_models[ALC260
  
  static struct snd_pci_quirk alc260_cfg_tbl[] = {
        SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),
+       SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),
        SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
        SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
        SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
@@@ -6621,7 -6622,7 +6622,7 @@@ static struct hda_input_mux alc889A_mb3
                /* Front Mic (0x01) unused */
                { "Line", 0x2 },
                /* Line 2 (0x03) unused */
 -              /* CD (0x04) unsused? */
 +              /* CD (0x04) unused? */
        },
  };