Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb3b07c2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Merge codec and controller helpers 



There is no much merit to keep the HD-audio codec and controller
helper codes in separate modules any longer.  Let's merge them into a
single helper module.

This patch just changes Makefile entries to merge two individual
modules to one.  The only code change is the removal of superfluous
MODULE_*() macros in one side.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 304dad30

sound/pci/hda/Makefile

+1 −2
Original line number Diff line number Diff line 
snd-hda-intel-objs := hda_intel.o

snd-hda-controller-objs := hda_controller.o

snd-hda-tegra-objs := hda_tegra.o

# for haswell power well

snd-hda-intel-$(CONFIG_SND_HDA_I915) +=	hda_i915.o



snd-hda-codec-y := hda_bind.o hda_codec.o hda_jack.o hda_auto_parser.o hda_sysfs.o

snd-hda-codec-y += hda_controller.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
@@ -27,7 +27,6 @@ snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o 


# common driver

obj-$(CONFIG_SND_HDA) := snd-hda-codec.o

obj-$(CONFIG_SND_HDA) += snd-hda-controller.o



# codec drivers

obj-$(CONFIG_SND_HDA_GENERIC) += snd-hda-codec-generic.o

sound/pci/hda/hda_controller.c

+0 −3
Original line number Diff line number Diff line
@@ -1966,6 +1966,3 @@ int azx_init_stream(struct azx *chip) 
	return 0;

}

EXPORT_SYMBOL_GPL(azx_init_stream);
 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Common HDA driver functions");