commit 4413c8d2be530d7310feaceaae28350b316b2068 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge branch 'fix/hda' into for-linus

* fix/hda:
ALSA: hda - Add quirk for HP 6930p
ALSA: hda - Add missing static to patch_ca0110()

Takashi Iwai 16 years ago 4413c8d2 cfbc7800

+2 -1

2 changed files

expand all

unified split

sound

pci

hda

patch_analog.c

patch_ca0110.c

sound/pci/hda/patch_analog.c

··· 3978 3978 SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP), 3979 3979 SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), 3980 3980 SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE), 3981 + SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30d0, "HP laptop", AD1884A_LAPTOP), 3981 3982 SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP), 3982 3983 SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP), 3983 3984 SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),

+1 -1

sound/pci/hda/patch_ca0110.c

··· 510 510 } 511 511 512 512 513 - int patch_ca0110(struct hda_codec *codec) 513 + static int patch_ca0110(struct hda_codec *codec) 514 514 { 515 515 struct ca0110_spec *spec; 516 516 int err;