From bbcb5a213f42b542942043de1c78c4b493427f83 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 Dec 2008 14:43:21 +0100
Subject: [PATCH] --- yaml --- r: 120530 b: refs/heads/master c:
 31117b78ee843622cbc4c7c17c97be417c766385 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/sound/pci/hda/hda_codec.c    | 1 +
 trunk/sound/pci/hda/patch_nvhdmi.c | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 992787f47abc..aa68890a09b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c0b9bec460c348d2ee5a800c288e5d0e8fcda66
+refs/heads/master: 31117b78ee843622cbc4c7c17c97be417c766385
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index d49d0b698687..f6832e160684 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -46,6 +46,7 @@ static struct hda_vendor_id hda_vendor_ids[] = {
 	{ 0x1002, "ATI" },
 	{ 0x1057, "Motorola" },
 	{ 0x1095, "Silicon Image" },
+	{ 0x10de, "Nvidia" },
 	{ 0x10ec, "Realtek" },
 	{ 0x1106, "VIA" },
 	{ 0x111d, "IDT" },
diff --git a/trunk/sound/pci/hda/patch_nvhdmi.c b/trunk/sound/pci/hda/patch_nvhdmi.c
index 0cd53063e62e..0270fda0bda5 100644
--- a/trunk/sound/pci/hda/patch_nvhdmi.c
+++ b/trunk/sound/pci/hda/patch_nvhdmi.c
@@ -159,9 +159,9 @@ static int patch_nvhdmi(struct hda_codec *codec)
  * patch entries
  */
 static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
-	{ .id = 0x10de0002, .name = "NVIDIA MCP78 HDMI", .patch = patch_nvhdmi },
-	{ .id = 0x10de0007, .name = "NVIDIA MCP7A HDMI", .patch = patch_nvhdmi },
-	{ .id = 0x10de0067, .name = "NVIDIA MCP67 HDMI", .patch = patch_nvhdmi },
+	{ .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi },
+	{ .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi },
+	{ .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi },
 	{} /* terminator */
 };