diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:13:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:13:38 -0400 |
| commit | fc8a327db6c46de783b1a4276d846841b9abc24c (patch) | |
| tree | bee512c142cccea93511debd98ef954581693727 /sound/isa/Makefile | |
| parent | 92d15c2ccbb3e31a3fc71ad28fdb55e1319383c0 (diff) | |
| parent | 24837e6f249a2c83667552e6871c1543b4a6b934 (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (264 commits)
[ALSA] version 1.0.15
[ALSA] Fix thinko in cs4231 mce down check
[ALSA] sun-cs4231: improved waiting after MCE down
[ALSA] sun-cs4231: use cs4231-regs.h
[ALSA] This simplifies and fixes waiting loops of the mce_down()
[ALSA] This patch adds support for a wavetable chip on
[ALSA] This patch removes open_mutex from the ad1848-lib as
[ALSA] fix bootup crash in snd_gus_interrupt()
[ALSA] hda-codec - Fix SKU ID function for realtek codecs
[ALSA] Support ASUS P701 eeepc [0x1043 0x82a1] support
[ALSA] hda-codec - Add array terminator for dmic in STAC codec
[ALSA] hdsp - Fix zero division
[ALSA] usb-audio - Fix double comment
[ALSA] hda-codec - Fix STAC922x volume knob control
[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
[ALSA] hda-codec - Fix for Fujitsu Lifebook C1410
[ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag
[ALSA] mpu-401: do not require an ACK byte for the ENTER_UART command
[ALSA] via82xx - Add DXS quirk for Shuttle AK31v2
[ALSA] hda-codec - Fix input_mux numbers for vaio stac92xx
...
Diffstat (limited to 'sound/isa/Makefile')
| -rw-r--r-- | sound/isa/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/isa/Makefile b/sound/isa/Makefile index bb317ccc170f..c0ce7db2a1b5 100644 --- a/sound/isa/Makefile +++ b/sound/isa/Makefile | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for ALSA | 2 | # Makefile for ALSA |
| 3 | # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> | 3 | # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> |
| 4 | # | 4 | # |
| 5 | 5 | ||
| 6 | snd-adlib-objs := adlib.o | 6 | snd-adlib-objs := adlib.o |
| @@ -10,6 +10,7 @@ snd-cmi8330-objs := cmi8330.o | |||
| 10 | snd-dt019x-objs := dt019x.o | 10 | snd-dt019x-objs := dt019x.o |
| 11 | snd-es18xx-objs := es18xx.o | 11 | snd-es18xx-objs := es18xx.o |
| 12 | snd-opl3sa2-objs := opl3sa2.o | 12 | snd-opl3sa2-objs := opl3sa2.o |
| 13 | snd-sc6000-objs := sc6000.o | ||
| 13 | snd-sgalaxy-objs := sgalaxy.o | 14 | snd-sgalaxy-objs := sgalaxy.o |
| 14 | snd-sscape-objs := sscape.o | 15 | snd-sscape-objs := sscape.o |
| 15 | 16 | ||
| @@ -21,6 +22,7 @@ obj-$(CONFIG_SND_CMI8330) += snd-cmi8330.o | |||
| 21 | obj-$(CONFIG_SND_DT019X) += snd-dt019x.o | 22 | obj-$(CONFIG_SND_DT019X) += snd-dt019x.o |
| 22 | obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o | 23 | obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o |
| 23 | obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o | 24 | obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o |
| 25 | obj-$(CONFIG_SND_SC6000) += snd-sc6000.o | ||
| 24 | obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o | 26 | obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o |
| 25 | obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o | 27 | obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o |
| 26 | 28 | ||