diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
commit | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (patch) | |
tree | fb856b5998df266bd83e6e64b8884287e812845a /sound/pci/hda/patch_analog.c | |
parent | 875999c5539999f61a45620aae0c3e5fb1d2b035 (diff) | |
parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 2bfe37e8543c..bcfca159c6a2 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -801,6 +801,10 @@ static struct hda_board_config ad1986a_cfg_tbl[] = { | |||
801 | .config = AD1986A_LAPTOP_EAPD }, /* Samsung R65-T2300 Charis */ | 801 | .config = AD1986A_LAPTOP_EAPD }, /* Samsung R65-T2300 Charis */ |
802 | { .pci_subvendor = 0x1043, .pci_subdevice = 0x1213, | 802 | { .pci_subvendor = 0x1043, .pci_subdevice = 0x1213, |
803 | .config = AD1986A_LAPTOP_EAPD }, /* ASUS A6J */ | 803 | .config = AD1986A_LAPTOP_EAPD }, /* ASUS A6J */ |
804 | { .pci_subvendor = 0x1043, .pci_subdevice = 0x11f7, | ||
805 | .config = AD1986A_LAPTOP_EAPD }, /* ASUS U5A */ | ||
806 | { .pci_subvendor = 0x103c, .pci_subdevice = 0x30af, | ||
807 | .config = AD1986A_LAPTOP_EAPD }, /* HP Compaq Presario B2800 */ | ||
804 | {} | 808 | {} |
805 | }; | 809 | }; |
806 | 810 | ||
@@ -1330,6 +1334,8 @@ static struct hda_board_config ad1981_cfg_tbl[] = { | |||
1330 | .config = AD1981_HP }, /* HP nx6320 */ | 1334 | .config = AD1981_HP }, /* HP nx6320 */ |
1331 | { .pci_subvendor = 0x103c, .pci_subdevice = 0x309f, | 1335 | { .pci_subvendor = 0x103c, .pci_subdevice = 0x309f, |
1332 | .config = AD1981_HP }, /* HP nx9420 AngelFire */ | 1336 | .config = AD1981_HP }, /* HP nx9420 AngelFire */ |
1337 | { .pci_subvendor = 0x103c, .pci_subdevice = 0x30a2, | ||
1338 | .config = AD1981_HP }, /* HP nx9420 AngelFire */ | ||
1333 | { .modelname = "basic", .config = AD1981_BASIC }, | 1339 | { .modelname = "basic", .config = AD1981_BASIC }, |
1334 | {} | 1340 | {} |
1335 | }; | 1341 | }; |