---

yaml --- r: 187001 b: refs/heads/master c: 2504570 h: refs/heads/master i: 186999: 0db576f v: v3
git-mirror · Mar 4, 2010 · 22b06f2 · 22b06f2
1 parent decddcf
commit 22b06f2
Show file tree

Hide file tree

Showing 4 changed files with 991 additions and 53 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7445dfc159f90b4bc82fd7d898b53d74520e2f83
+refs/heads/master: 25045705d4053925a617ed71c5e4b6888e468765
diff --git a/trunk/sound/pci/hda/Kconfig b/trunk/sound/pci/hda/Kconfig
@@ -157,7 +157,7 @@ config SND_HDA_CODEC_INTELHDMI
 
 config SND_HDA_ELD
 	def_bool y
-	depends on SND_HDA_CODEC_INTELHDMI
+	depends on SND_HDA_CODEC_INTELHDMI || SND_HDA_CODEC_NVHDMI
 
 config SND_HDA_CODEC_CIRRUS
 	bool "Build Cirrus Logic codec support"

diff --git a/trunk/sound/pci/hda/Makefile b/trunk/sound/pci/hda/Makefile
@@ -17,7 +17,7 @@ snd-hda-codec-cirrus-objs :=	patch_cirrus.o
 snd-hda-codec-ca0110-objs :=	patch_ca0110.o
 snd-hda-codec-conexant-objs :=	patch_conexant.o
 snd-hda-codec-via-objs :=	patch_via.o
-snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o
+snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o hda_eld.o
 snd-hda-codec-intelhdmi-objs :=	patch_intelhdmi.o hda_eld.o
 
 # common driver