diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 09:35:43 +0100 |
| commit | f1cf9a666de65254b0c56b4dec8ca2ecdab5b620 (patch) | |
| tree | 88a97e58f83ba2ccaffd7d3ac250e55d7384827d /sound/pci/hda/Makefile | |
| parent | 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (diff) | |
| parent | 2abbf4391fb56dfa97221ed6796782537d15196f (diff) | |
| download | kernel_samsung_smdk4412-f1cf9a666de65254b0c56b4dec8ca2ecdab5b620.zip kernel_samsung_smdk4412-f1cf9a666de65254b0c56b4dec8ca2ecdab5b620.tar.gz kernel_samsung_smdk4412-f1cf9a666de65254b0c56b4dec8ca2ecdab5b620.tar.bz2 | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/Makefile')
| -rw-r--r-- | sound/pci/hda/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 315a1c4..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 @@ -18,7 +18,7 @@ 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 -snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o hda_eld.o +snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o # common driver obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o |