diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-16 08:43:21 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-16 08:43:21 -0500 |
commit | 31117b78ee843622cbc4c7c17c97be417c766385 (patch) | |
tree | e149bd7149cb211be765f00399f5aec778cc83a9 /sound/pci | |
parent | 5c0b9bec460c348d2ee5a800c288e5d0e8fcda66 (diff) |
ALSA: hda - Add Nvidia vendor id string
Added Nvidia (0x10de) to the vendor id list.
Cleaned up the codec name strings accordingly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index d49d0b698687..f6832e160684 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -46,6 +46,7 @@ static struct hda_vendor_id hda_vendor_ids[] = { | |||
46 | { 0x1002, "ATI" }, | 46 | { 0x1002, "ATI" }, |
47 | { 0x1057, "Motorola" }, | 47 | { 0x1057, "Motorola" }, |
48 | { 0x1095, "Silicon Image" }, | 48 | { 0x1095, "Silicon Image" }, |
49 | { 0x10de, "Nvidia" }, | ||
49 | { 0x10ec, "Realtek" }, | 50 | { 0x10ec, "Realtek" }, |
50 | { 0x1106, "VIA" }, | 51 | { 0x1106, "VIA" }, |
51 | { 0x111d, "IDT" }, | 52 | { 0x111d, "IDT" }, |
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index 0cd53063e62e..0270fda0bda5 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c | |||
@@ -159,9 +159,9 @@ static int patch_nvhdmi(struct hda_codec *codec) | |||
159 | * patch entries | 159 | * patch entries |
160 | */ | 160 | */ |
161 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { | 161 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { |
162 | { .id = 0x10de0002, .name = "NVIDIA MCP78 HDMI", .patch = patch_nvhdmi }, | 162 | { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi }, |
163 | { .id = 0x10de0007, .name = "NVIDIA MCP7A HDMI", .patch = patch_nvhdmi }, | 163 | { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi }, |
164 | { .id = 0x10de0067, .name = "NVIDIA MCP67 HDMI", .patch = patch_nvhdmi }, | 164 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi }, |
165 | {} /* terminator */ | 165 | {} /* terminator */ |
166 | }; | 166 | }; |
167 | 167 | ||