aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-04 16:05:24 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-04 16:05:24 +0100
commitdd74b4653597d1d321efa13935cb029b4d819343 (patch)
tree6a1a14cf6307f12b388ba73b8da2b619983babb5 /sound/pci/hda/Makefile
parent25045705d4053925a617ed71c5e4b6888e468765 (diff)
downloadkernel_samsung_espresso10-dd74b4653597d1d321efa13935cb029b4d819343.zip
kernel_samsung_espresso10-dd74b4653597d1d321efa13935cb029b4d819343.tar.gz
kernel_samsung_espresso10-dd74b4653597d1d321efa13935cb029b4d819343.tar.bz2
ALSA: hda - Build hda_eld into snd-hda-codec module
Now two modules require hda_eld.o, so we need to put it to the common place instead of building into two individual modules. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/Makefile')
-rw-r--r--sound/pci/hda/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 199f440..24bc195 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -3,7 +3,7 @@ snd-hda-intel-objs := hda_intel.o
snd-hda-codec-y := hda_codec.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_ELD) += hda_eld.o
+snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o
snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
@@ -17,8 +17,8 @@ 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 hda_eld.o
-snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o hda_eld.o
+snd-hda-codec-nvhdmi-objs := patch_nvhdmi.o
+snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o
# common driver
obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o