diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 14:53:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 14:53:31 -0400 |
| commit | 0950c358ee8e969fce45ba363ca1deaf211e57b0 (patch) | |
| tree | 4c3b66e8457e1568aa26696d268e0e9c264382cb /sound/Makefile | |
| parent | 3aa590c6b7c89d844f81c2e96f295cf2c6967773 (diff) | |
| parent | 8caf7aa26e0797e5706043f94c491acd1a08636a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] echoaudio - Remove kfree_nocheck()
[ALSA] echoaudio - Fix Makefile
[ALSA] Add Intel D965 board support
[ALSA] Fix/add support of Realtek ALC883 / ALC888 and ALC861 codecs
[ALSA] Fix a typo in echoaudio/midi.c
[ALSA] snd-aoa: enable dual-edge in GPIOs
[ALSA] snd-aoa: support iMac G5 iSight
[ALSA] snd-aoa: not experimental
[ALSA] Add echoaudio sound drivers
[ALSA] ak4xxx-adda - Code clean-up
[ALSA] Remove CONFIG_EXPERIMENTAL from intel8x0m driver
[ALSA] Stereo controls for M-Audio Revolution cards
[ALSA] Fix misuse of __list_add() in seq_ports.c
[ALSA] hda-codec - Add model entry for Samsung X60 Chane
[ALSA] make CONFIG_SND_DYNAMIC_MINORS non-experimental
[ALSA] Fix wrong dependencies of snd-aoa driver
[ALSA] fix build failure due to snd-aoa
[ALSA] AD1888 mixer controls for DC mode
[ALSA] Suppress irq handler mismatch messages in ALSA ISA drivers
[ALSA] usb-audio support for Turtle Beach Roadie
Diffstat (limited to 'sound/Makefile')
| -rw-r--r-- | sound/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/Makefile b/sound/Makefile index a682ea30f0c9..1f60797afa8a 100644 --- a/sound/Makefile +++ b/sound/Makefile | |||
| @@ -4,7 +4,8 @@ | |||
| 4 | obj-$(CONFIG_SOUND) += soundcore.o | 4 | obj-$(CONFIG_SOUND) += soundcore.o |
| 5 | obj-$(CONFIG_SOUND_PRIME) += oss/ | 5 | obj-$(CONFIG_SOUND_PRIME) += oss/ |
| 6 | obj-$(CONFIG_DMASOUND) += oss/ | 6 | obj-$(CONFIG_DMASOUND) += oss/ |
| 7 | obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ aoa/ | 7 | obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ |
| 8 | obj-$(CONFIG_SND_AOA) += aoa/ | ||
| 8 | 9 | ||
| 9 | ifeq ($(CONFIG_SND),y) | 10 | ifeq ($(CONFIG_SND),y) |
| 10 | obj-y += last.o | 11 | obj-y += last.o |