summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/Makefile')
-rw-r--r--sound/pci/hda/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index b2484bbdcc1..f85c34551ac 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,8 +1,8 @@
-snd-hda-intel-objs := hda_intel.o
+snd-hda-intel-y := hda_intel.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 \
+snd-hda-intel-y += hda_codec.o \
hda_generic.o \
patch_realtek.o \
patch_cmedia.o \
@@ -12,8 +12,7 @@ snd-hda-intel-objs += hda_codec.o \
patch_atihdmi.o \
patch_conexant.o \
patch_via.o
-ifdef CONFIG_PROC_FS
-snd-hda-intel-objs += hda_proc.o
-endif
+snd-hda-intel-$(CONFIG_PROC_FS) += hda_proc.o
+snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o