Merge branch 'topic/hda' into for-linus

git-mirror · May 21, 2012 · 6de15b2 · 6de15b2
2 parents 775b244 + 8a39057
commit 6de15b2
Show file tree

Hide file tree

Showing 19 changed files with 1,612 additions and 1,387 deletions.
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
@@ -1,6 +1,6 @@
 snd-hda-intel-objs := hda_intel.o
 
-snd-hda-codec-y := hda_codec.o hda_jack.o
+snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o
 snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o
 snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o
 snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o