summaryrefslogtreecommitdiff
path: root/sound/pci/hda/Makefile
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2014-02-28 15:41:22 -0800
committerTakashi Iwai <tiwai@suse.de>2014-03-01 11:22:17 +0100
commit05e848788e30b2ee0b2736b99b6e458b6c7a4e7d (patch)
tree30d49442fcbcef20ec6327567e6f3e3c3ed315fd /sound/pci/hda/Makefile
parent8769b278610c71a32ae9662219b2f450d48a828c (diff)
ALSA: hda - Add hda_controller.c and move pcm ops from hda_intel
Pull the pcm_ops and the functions they use into a new hda_controller file. This is done to allow for other hda implementations besides PCI to use the same ops. The hda_controller file will house functionality related to HDA but independent of the bus used to talk to the controller. This currently shares dsp locking across the two files. This will be remedied in a following commit. Signed-off-by: Dylan Reid <dgreid@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/Makefile')
-rw-r--r--sound/pci/hda/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 083b338e0783..5deef4febdea 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,4 +1,4 @@
-snd-hda-intel-objs := hda_intel.o
+snd-hda-intel-objs := hda_controller.o hda_intel.o
# for haswell power well
snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o
@@ -9,7 +9,7 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
# for trace-points
CFLAGS_hda_codec.o := -I$(src)
-CFLAGS_hda_intel.o := -I$(src)
+CFLAGS_hda_controller.o := -I$(src)
snd-hda-codec-generic-objs := hda_generic.o
snd-hda-codec-realtek-objs := patch_realtek.o