X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=sound%2Fpci%2Fhda%2FMakefile;h=b2484bbdcc1d5e66c1e0fa90163a482c9adef3b9;hb=2c11f955b27edaf0270185781391abe6f39b7ed0;hp=60d7b05a204a28a26c8cf2dab727454e9b276533;hpb=bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1;p=powerpc.git

diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 60d7b05a20..b2484bbdcc 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,5 +1,8 @@
 snd-hda-intel-objs := hda_intel.o
-snd-hda-codec-objs := hda_codec.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 \
@@ -10,7 +13,7 @@ snd-hda-codec-objs := hda_codec.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