diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:27 +0200 |
commit | e618a5609e504845786c71e2825e10b6a9728185 (patch) | |
tree | 6c9e1a40216b776923567f9b3506a8fee66dec89 /sound/pci/Makefile | |
parent | d3e3743694cbfd64450b3468e11b40ba8c6f4369 (diff) | |
parent | a5990dc5b96f537618b0f057c8723a6a0b0cdc74 (diff) |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi: (35 commits)
ALSA: ctxfi - Clear PCM resources at hw_params and hw_free
ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks
ALSA: ctxfi - Add missing start check in atc_pcm_playback_start()
ALSA: ctxfi - Add use_system_timer module option
ALSA: ctxfi - Fix wrong model id for UAA
ALSA: ctxfi - Clean up probe routines
ALSA: ctxfi - Fix / clean up hw20k2 chip code
ALSA: ctxfi - Fix possible buffer pointer overrun
ALSA: ctxfi - Remove useless initializations and cast
ALSA: ctxfi - Fix DMA mask for emu20k2 chip
ALSA: ctxfi - Make volume controls more intuitive
ALSA: ctxfi - Optimize the native timer handling using wc counter
ALSA: ctxfi - Add missing inclusion of linux/math64.h
ALSA: ctxfi - Set device 0 for mixer control elements
ALSA: ctxfi - Clean up / optimize
ALSA: ctxfi - Set periods_min to 2
ALSA: ctxfi - Use native timer interrupt on emu20k1
ALSA: ctxfi - Fix previous fix for 64bit DMA
ALSA: ctxfi - Fix endian-dependent codes
ALSA: ctxfi - Allow 64bit DMA
...
Diffstat (limited to 'sound/pci/Makefile')
-rw-r--r-- | sound/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/Makefile b/sound/pci/Makefile index 65b25d221cd..6a1281ec01e 100644 --- a/sound/pci/Makefile +++ b/sound/pci/Makefile @@ -59,6 +59,7 @@ obj-$(CONFIG_SND) += \ ali5451/ \ au88x0/ \ aw2/ \ + ctxfi/ \ ca0106/ \ cs46xx/ \ cs5535audio/ \ |