Merge branch 'topic/misc' into fix/misc

2026-09-26 18:16:26 +00:00 · 2010-03-16 07:50:49 +01:00 · 2010-03-16 07:50:49 +01:00 · a9104f9899
commit a9104f9899
parent ad6cfc2ac7 89c0ac7cab
164 changed files with 7156 additions and 2462 deletions
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
--- a/include/sound/core.h
+++ b/include/sound/core.h
--- a/include/sound/cs46xx_dsp_spos.h
+++ b/include/sound/cs46xx_dsp_spos.h
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
--- a/include/sound/sb.h
+++ b/include/sound/sb.h
--- a/include/sound/version.h
+++ b/include/sound/version.h
--- a/sound/core/control.c
+++ b/sound/core/control.c
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
--- a/sound/core/seq/seq_timer.c
+++ b/sound/core/seq/seq_timer.c
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
--- a/sound/isa/sb/Makefile
+++ b/sound/isa/sb/Makefile
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
--- a/sound/oss/coproc.h
+++ b/sound/oss/coproc.h
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
--- a/sound/oss/v_midi.h
+++ b/sound/oss/v_midi.h
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
--- a/sound/pci/au88x0/au8810.c
+++ b/sound/pci/au88x0/au8810.c
--- a/sound/pci/au88x0/au8820.c
+++ b/sound/pci/au88x0/au8820.c
--- a/sound/pci/au88x0/au8830.c
+++ b/sound/pci/au88x0/au8830.c
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
--- a/sound/pci/cs46xx/dsp_spos.h
+++ b/sound/pci/cs46xx/dsp_spos.h
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
--- a/sound/pci/ctxfi/ctatc.h
+++ b/sound/pci/ctxfi/ctatc.h
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
--- a/sound/pci/echoaudio/darla20.c
+++ b/sound/pci/echoaudio/darla20.c
--- a/sound/pci/echoaudio/darla20_dsp.c
+++ b/sound/pci/echoaudio/darla20_dsp.c
--- a/sound/pci/echoaudio/darla24.c
+++ b/sound/pci/echoaudio/darla24.c
--- a/sound/pci/echoaudio/darla24_dsp.c
+++ b/sound/pci/echoaudio/darla24_dsp.c
--- a/sound/pci/echoaudio/echo3g.c
+++ b/sound/pci/echoaudio/echo3g.c
--- a/sound/pci/echoaudio/echo3g_dsp.c
+++ b/sound/pci/echoaudio/echo3g_dsp.c
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
--- a/sound/pci/echoaudio/echoaudio.h
+++ b/sound/pci/echoaudio/echoaudio.h
--- a/sound/pci/echoaudio/echoaudio_3g.c
+++ b/sound/pci/echoaudio/echoaudio_3g.c
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
--- a/sound/pci/echoaudio/gina20.c
+++ b/sound/pci/echoaudio/gina20.c
--- a/sound/pci/echoaudio/gina20_dsp.c
+++ b/sound/pci/echoaudio/gina20_dsp.c
--- a/sound/pci/echoaudio/gina24.c
+++ b/sound/pci/echoaudio/gina24.c
--- a/sound/pci/echoaudio/gina24_dsp.c
+++ b/sound/pci/echoaudio/gina24_dsp.c
--- a/sound/pci/echoaudio/indigo.c
+++ b/sound/pci/echoaudio/indigo.c
--- a/sound/pci/echoaudio/indigo_dsp.c
+++ b/sound/pci/echoaudio/indigo_dsp.c
--- a/sound/pci/echoaudio/indigo_express_dsp.c
+++ b/sound/pci/echoaudio/indigo_express_dsp.c
--- a/sound/pci/echoaudio/indigodj.c
+++ b/sound/pci/echoaudio/indigodj.c
--- a/sound/pci/echoaudio/indigodj_dsp.c
+++ b/sound/pci/echoaudio/indigodj_dsp.c
--- a/sound/pci/echoaudio/indigodjx.c
+++ b/sound/pci/echoaudio/indigodjx.c
--- a/sound/pci/echoaudio/indigodjx_dsp.c
+++ b/sound/pci/echoaudio/indigodjx_dsp.c
--- a/sound/pci/echoaudio/indigoio.c
+++ b/sound/pci/echoaudio/indigoio.c
--- a/sound/pci/echoaudio/indigoio_dsp.c
+++ b/sound/pci/echoaudio/indigoio_dsp.c
--- a/sound/pci/echoaudio/indigoiox.c
+++ b/sound/pci/echoaudio/indigoiox.c
--- a/sound/pci/echoaudio/indigoiox_dsp.c
+++ b/sound/pci/echoaudio/indigoiox_dsp.c
--- a/sound/pci/echoaudio/layla20.c
+++ b/sound/pci/echoaudio/layla20.c
--- a/sound/pci/echoaudio/layla20_dsp.c
+++ b/sound/pci/echoaudio/layla20_dsp.c
--- a/sound/pci/echoaudio/layla24.c
+++ b/sound/pci/echoaudio/layla24.c
--- a/sound/pci/echoaudio/layla24_dsp.c
+++ b/sound/pci/echoaudio/layla24_dsp.c
--- a/sound/pci/echoaudio/mia.c
+++ b/sound/pci/echoaudio/mia.c
--- a/sound/pci/echoaudio/mia_dsp.c
+++ b/sound/pci/echoaudio/mia_dsp.c
--- a/sound/pci/echoaudio/mona.c
+++ b/sound/pci/echoaudio/mona.c
--- a/sound/pci/echoaudio/mona_dsp.c
+++ b/sound/pci/echoaudio/mona_dsp.c
--- a/Show more
+++ b/Show more