diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 13:03:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 13:03:35 -0700 |
| commit | 155dbfd8846bf165bb036c4492ad121c8b059f1d (patch) | |
| tree | 93c1140ecece7daac04da8a980d7b1d1e0c36bb0 /sound/isa/cs423x/Makefile | |
| parent | 15e0c694367332d7e7114c7c73044bc5fed9ee48 (diff) | |
| parent | d2a5b9d45f31bf5e5a1b89a87421e218ebe1a6ba (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa of HEAD
* HEAD:
[ALSA] Fix undefined (missing) references in ISA MIRO sound driver
[ALSA] make sound/isa/gus/gusextreme.c:devices static
[ALSA] hda-codec - Fix missing array terminators in AD1988 codec support
[ALSA] Fix a deadlock in snd-rtctimer
[ALSA] Fix section mismatch errors in ALSA PCI drivers
[ALSA] remove unused snd_minor.name field
[ALSA] Fix no mpu401 interface can cause hard freeze
[ALSA] wavefront: fix __init/__devinit confusion
[ALSA] Fix workaround for AD1988A rev2 codec
[ALSA] trivial: Code clean up of i2c/cs8427.c
[ALSA] sound/i2c/cs8427.c: don't export a static function
[ALSA] intel8x0 - Add ac97 quirk for Tyan Thunder K8WE board
[ALSA] Reduce the string length of Terratec Aureon 7.1 Universe
[ALSA] sound/pci/Kconfig - fix broken indenting for SND_FM801_TEA575X
[ALSA] fix the SND_FM801_TEA575X dependencies
[ALSA] Memory leak in sound/pcmcia/pdaudiocf/pdaudiocf.c
Diffstat (limited to 'sound/isa/cs423x/Makefile')
| -rw-r--r-- | sound/isa/cs423x/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile index d2afaea30cb..2fb4f7409d7 100644 --- a/sound/isa/cs423x/Makefile +++ b/sound/isa/cs423x/Makefile @@ -11,6 +11,7 @@ snd-cs4236-objs := cs4236.o # Toplevel Module Dependency obj-$(CONFIG_SND_AZT2320) += snd-cs4231-lib.o +obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o obj-$(CONFIG_SND_OPL3SA2) += snd-cs4231-lib.o obj-$(CONFIG_SND_CS4231) += snd-cs4231.o snd-cs4231-lib.o obj-$(CONFIG_SND_CS4232) += snd-cs4232.o snd-cs4231-lib.o |