diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-03 06:56:34 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-03 06:56:34 -0500 |
commit | d207df2df064c19a2cf4eac8f887351fe5ce526e (patch) | |
tree | f2005e1b2017c5e35a297318dcf6fe8a635f7c87 /sound/pci/hda/patch_hdmi.c | |
parent | 1aa924e21eec9dbb2c5fae90a71451a700db4414 (diff) | |
parent | c8900a0fad5ae9f4823451de17ba5dec6653ac74 (diff) |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index bb4930484ec4..251773e45f61 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
@@ -1638,6 +1638,9 @@ static struct hda_codec_preset snd_hda_preset_hdmi[] = { | |||
1638 | { .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | 1638 | { .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
1639 | { .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | 1639 | { .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
1640 | { .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | 1640 | { .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
1641 | { .id = 0x10de0015, .name = "GPU 15 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | ||
1642 | { .id = 0x10de0016, .name = "GPU 16 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | ||
1643 | /* 17 is known to be absent */ | ||
1641 | { .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | 1644 | { .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
1642 | { .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | 1645 | { .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
1643 | { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | 1646 | { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
@@ -1680,6 +1683,8 @@ MODULE_ALIAS("snd-hda-codec-id:10de0011"); | |||
1680 | MODULE_ALIAS("snd-hda-codec-id:10de0012"); | 1683 | MODULE_ALIAS("snd-hda-codec-id:10de0012"); |
1681 | MODULE_ALIAS("snd-hda-codec-id:10de0013"); | 1684 | MODULE_ALIAS("snd-hda-codec-id:10de0013"); |
1682 | MODULE_ALIAS("snd-hda-codec-id:10de0014"); | 1685 | MODULE_ALIAS("snd-hda-codec-id:10de0014"); |
1686 | MODULE_ALIAS("snd-hda-codec-id:10de0015"); | ||
1687 | MODULE_ALIAS("snd-hda-codec-id:10de0016"); | ||
1683 | MODULE_ALIAS("snd-hda-codec-id:10de0018"); | 1688 | MODULE_ALIAS("snd-hda-codec-id:10de0018"); |
1684 | MODULE_ALIAS("snd-hda-codec-id:10de0019"); | 1689 | MODULE_ALIAS("snd-hda-codec-id:10de0019"); |
1685 | MODULE_ALIAS("snd-hda-codec-id:10de001a"); | 1690 | MODULE_ALIAS("snd-hda-codec-id:10de001a"); |