[ALSA] HDA: Add support for Gateway NX860

[powerpc.git] / sound / pci / hda / Makefile

diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index dbacba6..b2484bb 100644 (file)
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,7 +1,19 @@
 snd-hda-intel-objs := hda_intel.o
-snd-hda-codec-objs := hda_codec.o hda_generic.o patch_realtek.o patch_cmedia.o patch_analog.o patch_sigmatel.o patch_si3054.o patch_atihdmi.o
+# since snd-hda-intel is the only driver using hda-codec,
+# merge it into a single module although it was originally
+# designed to be individual modules
+snd-hda-intel-objs += hda_codec.o \
+       hda_generic.o \
+       patch_realtek.o \
+       patch_cmedia.o \
+       patch_analog.o \
+       patch_sigmatel.o \
+       patch_si3054.o \
+       patch_atihdmi.o \
+       patch_conexant.o \
+       patch_via.o
 ifdef CONFIG_PROC_FS
-snd-hda-codec-objs += hda_proc.o
+snd-hda-intel-objs += hda_proc.o
 endif
 
-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o snd-hda-codec.o
+obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o