Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (28 commits) [ALSA] Kconfig SND_SEQUENCER_OSS help text fix [ALSA] Add Aux input switch control for Aureon Universe [ALSA] pcxhr - Fix the crash with REV01 board [ALSA] sound/pci/hda: use create_singlethread_workqueue() [ALSA] hda-intel - Add support of ATI SB600 [ALSA] cs4281 - Fix the check of timeout in probe [ALSA] cs4281 - Fix the check of right channel [ALSA] Test volume resolution of usb audio at initialization [ALSA] maestro3.c: fix BUG, optimization [ALSA] HDA/Realtek: multiple input mux definitions and pin mode additions [ALSA] AdLib FM card driver [ALSA] Fix / clean up PCM-OSS setup hooks [ALSA] Clean up PCM codes (take 2) [ALSA] Tiny clean up of PCM codes [ALSA] ISA drivers bailing on first !enable[i] [ALSA] Remove obsolete kfree_nocheck call [ALSA] Remove obsolete kfree_nocheck call [ALSA] Add snd-als300 driver for Avance Logic ALS300/ALS300+ soundcards [ALSA] Add snd-riptide driver for Conexant Riptide chip [ALSA] hda-codec - Fix noisy output wtih AD1986A 3stack model ...
Showing
- Documentation/sound/alsa/ALSA-Configuration.txt 69 additions, 0 deletionsDocumentation/sound/alsa/ALSA-Configuration.txt
- include/sound/core.h 1 addition, 1 deletioninclude/sound/core.h
- include/sound/pcm.h 7 additions, 8 deletionsinclude/sound/pcm.h
- include/sound/pcm_oss.h 1 addition, 2 deletionsinclude/sound/pcm_oss.h
- sound/core/Kconfig 3 additions, 2 deletionssound/core/Kconfig
- sound/core/control.c 3 additions, 3 deletionssound/core/control.c
- sound/core/control_compat.c 3 additions, 3 deletionssound/core/control_compat.c
- sound/core/init.c 1 addition, 8 deletionssound/core/init.c
- sound/core/oss/pcm_oss.c 109 additions, 179 deletionssound/core/oss/pcm_oss.c
- sound/core/pcm.c 6 additions, 8 deletionssound/core/pcm.c
- sound/core/pcm_lib.c 0 additions, 49 deletionssound/core/pcm_lib.c
- sound/core/pcm_native.c 75 additions, 82 deletionssound/core/pcm_native.c
- sound/isa/Kconfig 23 additions, 0 deletionssound/isa/Kconfig
- sound/isa/Makefile 2 additions, 0 deletionssound/isa/Makefile
- sound/isa/adlib.c 161 additions, 0 deletionssound/isa/adlib.c
- sound/isa/cmi8330.c 2 additions, 2 deletionssound/isa/cmi8330.c
- sound/isa/opti9xx/Makefile 2 additions, 0 deletionssound/isa/opti9xx/Makefile
- sound/isa/opti9xx/miro.c 1455 additions, 0 deletionssound/isa/opti9xx/miro.c
- sound/isa/opti9xx/miro.h 73 additions, 0 deletionssound/isa/opti9xx/miro.h
- sound/pci/Kconfig 28 additions, 2 deletionssound/pci/Kconfig
Loading
Please register or sign in to comment