diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-05-13 11:35:44 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-05-13 11:35:44 +0200 |
commit | d9bbb4756dbc05764cebd0e3e2f49a56c9504e4d (patch) | |
tree | b25672ad22284debf08d6663c228dcfe70e0be94 /sound/pci/hda/Makefile | |
parent | vga_switcheroo: Add the support for audio clients (diff) | |
parent | ALSA: hda - Disable FLOAT format support (diff) | |
download | linux-d9bbb4756dbc05764cebd0e3e2f49a56c9504e4d.tar.xz linux-d9bbb4756dbc05764cebd0e3e2f49a56c9504e4d.zip |
Merge branch 'topic/hda' into topic/hda-switcheroo
Diffstat (limited to 'sound/pci/hda/Makefile')
-rw-r--r-- | sound/pci/hda/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index ace157cc3d15..bd4149f1aaf4 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile @@ -1,6 +1,6 @@ snd-hda-intel-objs := hda_intel.o -snd-hda-codec-y := hda_codec.o hda_jack.o +snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.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_HWDEP) += hda_hwdep.o |