diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-11-18 06:03:56 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-26 07:42:38 -0500 |
commit | b21bdd0d343c8b2496690283211e27c9af598ed3 (patch) | |
tree | 23500f17dae3e8998009078e389f5702572ebbbf /sound/pci/hda/Makefile | |
parent | 873ce8ad502cce3ba9295890d52afcce385d4107 (diff) |
ALSA: hda - Split the generic parser as an individual module
Drop the hard dependency on the generic parser code and load / unload
the generic parser code dynamically if built as a module. This allows
us to avoid the generic parser if only HDMI/DP codecs are found.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/Makefile')
-rw-r--r-- | sound/pci/hda/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index c091438286a3..5a40c652df41 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile | |||
@@ -3,7 +3,6 @@ snd-hda-intel-objs := hda_intel.o | |||
3 | snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o | 3 | snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o |
4 | 4 | ||
5 | snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o | 5 | snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o |
6 | snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o | ||
7 | snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o | 6 | snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o |
8 | snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o | 7 | snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o |
9 | snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o | 8 | snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o |
@@ -12,6 +11,7 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o | |||
12 | CFLAGS_hda_codec.o := -I$(src) | 11 | CFLAGS_hda_codec.o := -I$(src) |
13 | CFLAGS_hda_intel.o := -I$(src) | 12 | CFLAGS_hda_intel.o := -I$(src) |
14 | 13 | ||
14 | snd-hda-codec-generic-objs := hda_generic.o | ||
15 | snd-hda-codec-realtek-objs := patch_realtek.o | 15 | snd-hda-codec-realtek-objs := patch_realtek.o |
16 | snd-hda-codec-cmedia-objs := patch_cmedia.o | 16 | snd-hda-codec-cmedia-objs := patch_cmedia.o |
17 | snd-hda-codec-analog-objs := patch_analog.o | 17 | snd-hda-codec-analog-objs := patch_analog.o |
@@ -28,6 +28,9 @@ snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o | |||
28 | obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o | 28 | obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o |
29 | 29 | ||
30 | # codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans) | 30 | # codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans) |
31 | ifdef CONFIG_SND_HDA_GENERIC | ||
32 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-generic.o | ||
33 | endif | ||
31 | ifdef CONFIG_SND_HDA_CODEC_REALTEK | 34 | ifdef CONFIG_SND_HDA_CODEC_REALTEK |
32 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-realtek.o | 35 | obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-realtek.o |
33 | endif | 36 | endif |