diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 10:43:27 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 10:43:27 +0400 |
commit | 76531d4166fb620375ff3c1ac24753265216d579 (patch) | |
tree | ed60dc74eda8a16de02f07b14c8036d3dee7a782 /sound/pci/hda/Makefile | |
parent | 7d339ae99758bc21033d4a19bcd4f7b55f96e24e (diff) | |
parent | a353fbb17961780c13e585e8658006ef0e543733 (diff) | |
download | linux-76531d4166fb620375ff3c1ac24753265216d579.tar.xz |
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, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 17ef3658f34b..87365d5ea2a9 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile @@ -13,6 +13,7 @@ snd-hda-codec-idt-objs := patch_sigmatel.o snd-hda-codec-si3054-objs := patch_si3054.o snd-hda-codec-cirrus-objs := patch_cirrus.o snd-hda-codec-ca0110-objs := patch_ca0110.o +snd-hda-codec-ca0132-objs := patch_ca0132.o snd-hda-codec-conexant-objs := patch_conexant.o snd-hda-codec-via-objs := patch_via.o snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o @@ -42,6 +43,9 @@ endif ifdef CONFIG_SND_HDA_CODEC_CA0110 obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0110.o endif +ifdef CONFIG_SND_HDA_CODEC_CA0132 +obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0132.o +endif ifdef CONFIG_SND_HDA_CODEC_CONEXANT obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-conexant.o endif |